From: Junio C Hamano <gitster@pobox•com>
To: Jens Lehmann <Jens.Lehmann@web•de>
Cc: Git Mailing List <git@vger•kernel.org>,
Jonathan Nieder <jrnieder@gmail•com>,
Heiko Voigt <hvoigt@hvoigt•net>,
"W. Trevor King" <wking@tremily•us>
Subject: Re: [WIP/PATCH 2/9] Teach reset the --[no-]recurse-submodules option
Date: Mon, 03 Feb 2014 14:40:27 -0800 [thread overview]
Message-ID: <xmqqd2j3ddlw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <52EFF2C5.3090705@web.de> (Jens Lehmann's message of "Mon, 03 Feb 2014 20:49:25 +0100")
Jens Lehmann <Jens.Lehmann@web•de> writes:
> This new option will allow the user to not only reset the work tree of
> the superproject but to also update the work tree of all initialized
> submodules (so they match the SHA-1 recorded in the superproject) when
> used together with --hard or --merge. But this commit only adds the
I agree that --soft and --mixed should not do anything. I am not
sure why --keep should not do anything to submodule working trees
when asked to recurse, though.
> option without any functionality, that will be added to unpack_trees()
> in subsequent commits.
>
> Signed-off-by: Jens Lehmann <Jens.Lehmann@web•de>
> ---
> Documentation/git-reset.txt | 4 ++++
> builtin/reset.c | 14 ++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
> index f445cb3..8f833f4 100644
> --- a/Documentation/git-reset.txt
> +++ b/Documentation/git-reset.txt
> @@ -94,6 +94,10 @@ OPTIONS
> --quiet::
> Be quiet, only report errors.
>
> +include::recurse-submodules-update.txt[]
> ++
> +This option only makes sense together with `--hard` and `--merge` and is
> +ignored when used without these options.
>
> EXAMPLES
> --------
> diff --git a/builtin/reset.c b/builtin/reset.c
> index 6004803..adf372e 100644
> --- a/builtin/reset.c
> +++ b/builtin/reset.c
> @@ -20,6 +20,7 @@
> #include "parse-options.h"
> #include "unpack-trees.h"
> #include "cache-tree.h"
> +#include "submodule.h"
>
> static const char * const git_reset_usage[] = {
> N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
> @@ -255,6 +256,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> {
> int reset_type = NONE, update_ref_status = 0, quiet = 0;
> int patch_mode = 0, unborn;
> + const char *recurse_submodules_default = "off";
> + int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
> const char *rev;
> unsigned char sha1[20];
> struct pathspec pathspec;
> @@ -270,13 +273,24 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> OPT_SET_INT(0, "keep", &reset_type,
> N_("reset HEAD but keep local changes"), KEEP),
> OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
> + { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules,
> + "checkout", "control recursive updating of submodules",
> + PARSE_OPT_OPTARG, option_parse_update_submodules },
> + { OPTION_STRING, 0, "recurse-submodules-default",
> + &recurse_submodules_default, NULL,
> + "default mode for recursion", PARSE_OPT_HIDDEN },
> OPT_END()
> };
>
> + gitmodules_config();
> git_config(git_default_config, NULL);
>
> argc = parse_options(argc, argv, prefix, options, git_reset_usage,
> PARSE_OPT_KEEP_DASHDASH);
> + set_config_update_recurse_submodules(
> + parse_update_recurse_submodules_arg("--recurse-submodules-default",
> + recurse_submodules_default),
> + recurse_submodules);
> parse_args(&pathspec, argv, prefix, patch_mode, &rev);
>
> unborn = !strcmp(rev, "HEAD") && get_sha1("HEAD", sha1);
next prev parent reply other threads:[~2014-02-03 22:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 22:36 What's cooking in git.git (Jan 2014, #01; Mon, 6) Junio C Hamano
2014-01-06 23:16 ` Francesco Pretto
2014-01-06 23:32 ` Junio C Hamano
2014-01-06 23:45 ` Francesco Pretto
2014-01-07 17:49 ` Jens Lehmann
[not found] ` <xmqqvbxvekwv.fsf@gitster.dls.corp.google.com>
2014-02-03 19:47 ` [WIP/PATCH 0/9] v2 submodule recursive checkout] Jens Lehmann
2014-02-03 19:48 ` [WIP/PATCH 1/9] submodule: prepare for recursive checkout of submodules Jens Lehmann
2014-02-03 22:23 ` Junio C Hamano
2014-02-07 21:06 ` Jens Lehmann
2014-02-04 0:01 ` Jonathan Nieder
2014-02-07 21:01 ` Jens Lehmann
2014-02-03 19:49 ` [WIP/PATCH 2/9] Teach reset the --[no-]recurse-submodules option Jens Lehmann
2014-02-03 22:40 ` Junio C Hamano [this message]
2014-02-07 21:09 ` Jens Lehmann
2014-02-03 19:50 ` [WIP/PATCH 3/9] Teach checkout " Jens Lehmann
2014-02-03 22:56 ` Junio C Hamano
2014-02-07 21:12 ` Jens Lehmann
2014-02-03 19:50 ` [WIP/PATCH 4/9] Teach merge " Jens Lehmann
2014-02-03 23:01 ` Junio C Hamano
2014-02-07 21:23 ` Jens Lehmann
2014-02-07 22:00 ` Junio C Hamano
2014-02-07 22:08 ` W. Trevor King
2014-02-03 19:51 ` [WIP/PATCH 5/9] Teach bisect--helper " Jens Lehmann
2014-02-03 19:51 ` [WIP/PATCH 6/9] Teach bisect " Jens Lehmann
2014-02-03 20:04 ` W. Trevor King
2014-02-03 20:22 ` Jens Lehmann
2014-02-03 19:52 ` [WIP/PATCH 7/9] submodule: teach unpack_trees() to remove submodule contents Jens Lehmann
2014-02-03 20:10 ` W. Trevor King
2014-02-07 21:24 ` Jens Lehmann
2014-02-03 19:53 ` [WIP/PATCH 8/9] submodule: teach unpack_trees() to repopulate submodules Jens Lehmann
2014-02-03 19:54 ` [WIP/PATCH 9/9] submodule: teach unpack_trees() to update submodules Jens Lehmann
2014-02-03 20:19 ` W. Trevor King
2014-02-07 21:25 ` Jens Lehmann
2014-02-04 0:11 ` Duy Nguyen
2014-02-07 21:32 ` Jens Lehmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd2j3ddlw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
--cc=jrnieder@gmail$(echo .)com \
--cc=wking@tremily$(echo .)us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox