diff options
| author | Stefan Beller <sbeller@google.com> | 2017-05-26 19:10:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 05:28:53 (GMT) |
| commit | 58b75bd6db45a5108af41b764d617d677f26a6ca (patch) | |
| tree | 14ceedcffb95f5d8f07cdf44ef9ab8ebb3c5ae6a /builtin/reset.c | |
| parent | 234b10d6f1efbb19fe0e3769f188b6b97cd2a519 (diff) | |
| download | git-58b75bd6db45a5108af41b764d617d677f26a6ca.zip git-58b75bd6db45a5108af41b764d617d677f26a6ca.tar.gz git-58b75bd6db45a5108af41b764d617d677f26a6ca.tar.bz2 | |
submodule recursing: do not write a config variable twice
The command line option for '--recurse-submodules' is implemented
using an OPTION_CALLBACK, which takes both the callback (that sets
the file static global variable) as well as passes the same file
static global variable to the option parsing machinery to assign it.
This is fixed in this commit by passing NULL as the variable. The
callback sets it instead
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 5ce27fc..1e5f85b 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -304,7 +304,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) N_("reset HEAD, index and working tree"), MERGE), OPT_SET_INT(0, "keep", &reset_type, N_("reset HEAD but keep local changes"), KEEP), - { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, + { OPTION_CALLBACK, 0, "recurse-submodules", NULL, "reset", "control recursive updating of submodules", PARSE_OPT_OPTARG, option_parse_recurse_submodules }, OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")), |