summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-18 21:53:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-18 21:53:29 (GMT)
commit5cc9522b1575f832db8fd9dc4974a8a67c59dcb8 (patch)
treee56a8e9defb059735be0e9a1d7cd97ec2842c4ee /builtin/checkout.c
parent7455e33cba53e015982ea6c61c49c2cfbadd7141 (diff)
parent679e3693aba0c17af60c031f7eef68f2296b8dad (diff)
downloadgit-5cc9522b1575f832db8fd9dc4974a8a67c59dcb8.zip
git-5cc9522b1575f832db8fd9dc4974a8a67c59dcb8.tar.gz
git-5cc9522b1575f832db8fd9dc4974a8a67c59dcb8.tar.bz2
Merge branch 'gc/branch-recurse-submodules'
"git branch" learned the "--recurse-submodules" option. * gc/branch-recurse-submodules: branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks branch: add --recurse-submodules option for branch creation builtin/branch: consolidate action-picking logic in cmd_branch() branch: add a dry_run parameter to create_branch() branch: make create_branch() always create a branch branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index f6e65fe..2b33960 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -909,7 +909,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
opts->new_branch_force ? 1 : 0,
opts->new_branch_log,
opts->quiet,
- opts->track);
+ opts->track,
+ 0);
free(new_branch_info->name);
free(new_branch_info->refname);
new_branch_info->name = xstrdup(opts->new_branch);