diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-04 10:56:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-04 10:56:23 -0700 |
| commit | da95e25656690e4b585b73677e9db746bd796a67 (patch) | |
| tree | 0f43893dabfa07242eeb4cb3fd8c74f77a1ead09 /builtin | |
| parent | 98f6a3a35335d5d4b48df0088f2da0075e07f99c (diff) | |
| parent | 6696601241d27cf7b2834b92788a73a6f4af2e89 (diff) | |
Merge branch 'gc/branch-recurse-submodules-fix'
A handful of obvious clean-ups around a topic that is already in 'master'. * gc/branch-recurse-submodules-fix: branch.c: simplify advice-and-die sequence branch: rework comments for future developers branch: remove negative exit code branch --set-upstream-to: be consistent when advising branch: give submodule updating advice before exit branch: support more tracking modes when recursing
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/submodule--helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 8d03d3f6b1..c3e0d4570f 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3073,9 +3073,10 @@ static int module_create_branch(int argc, const char **argv, const char *prefix) OPT__FORCE(&force, N_("force creation"), 0), OPT_BOOL(0, "create-reflog", &reflog, N_("create the branch's reflog")), - OPT_SET_INT('t', "track", &track, - N_("set up tracking mode (see git-pull(1))"), - BRANCH_TRACK_EXPLICIT), + OPT_CALLBACK_F('t', "track", &track, "(direct|inherit)", + N_("set branch tracking configuration"), + PARSE_OPT_OPTARG, + parse_opt_tracking_mode), OPT__DRY_RUN(&dry_run, N_("show whether the branch would be created")), OPT_END() |