Merge branch 'rs/remove-unused-find-header-mem'
[git.git] / branch.c
blobdf5d24fec6d909b2ceb78862e03907318a2cd315
1 #include "git-compat-util.h"
2 #include "advice.h"
3 #include "config.h"
4 #include "branch.h"
5 #include "environment.h"
6 #include "gettext.h"
7 #include "hex.h"
8 #include "object-name.h"
9 #include "path.h"
10 #include "refs.h"
11 #include "refspec.h"
12 #include "remote.h"
13 #include "repository.h"
14 #include "sequencer.h"
15 #include "commit.h"
16 #include "worktree.h"
17 #include "submodule-config.h"
18 #include "run-command.h"
19 #include "strmap.h"
21 struct tracking {
22 struct refspec_item spec;
23 struct string_list *srcs;
24 const char *remote;
25 int matches;
28 struct find_tracked_branch_cb {
29 struct tracking *tracking;
30 struct string_list ambiguous_remotes;
33 static int find_tracked_branch(struct remote *remote, void *priv)
35 struct find_tracked_branch_cb *ftb = priv;
36 struct tracking *tracking = ftb->tracking;
38 if (!remote_find_tracking(remote, &tracking->spec)) {
39 switch (++tracking->matches) {
40 case 1:
41 string_list_append_nodup(tracking->srcs, tracking->spec.src);
42 tracking->remote = remote->name;
43 break;
44 case 2:
45 /* there are at least two remotes; backfill the first one */
46 string_list_append(&ftb->ambiguous_remotes, tracking->remote);
47 /* fall through */
48 default:
49 string_list_append(&ftb->ambiguous_remotes, remote->name);
50 free(tracking->spec.src);
51 string_list_clear(tracking->srcs, 0);
52 break;
54 /* remote_find_tracking() searches by src if present */
55 tracking->spec.src = NULL;
57 return 0;
60 static int should_setup_rebase(const char *origin)
62 switch (autorebase) {
63 case AUTOREBASE_NEVER:
64 return 0;
65 case AUTOREBASE_LOCAL:
66 return origin == NULL;
67 case AUTOREBASE_REMOTE:
68 return origin != NULL;
69 case AUTOREBASE_ALWAYS:
70 return 1;
72 return 0;
75 /**
76 * Install upstream tracking configuration for a branch; specifically, add
77 * `branch.<name>.remote` and `branch.<name>.merge` entries.
79 * `flag` contains integer flags for options; currently only
80 * BRANCH_CONFIG_VERBOSE is checked.
82 * `local` is the name of the branch whose configuration we're installing.
84 * `origin` is the name of the remote owning the upstream branches. NULL means
85 * the upstream branches are local to this repo.
87 * `remotes` is a list of refs that are upstream of local
89 static int install_branch_config_multiple_remotes(int flag, const char *local,
90 const char *origin, struct string_list *remotes)
92 const char *shortname = NULL;
93 struct strbuf key = STRBUF_INIT;
94 struct string_list_item *item;
95 int rebasing = should_setup_rebase(origin);
97 if (!remotes->nr)
98 BUG("must provide at least one remote for branch config");
99 if (rebasing && remotes->nr > 1)
100 die(_("cannot inherit upstream tracking configuration of "
101 "multiple refs when rebasing is requested"));
104 * If the new branch is trying to track itself, something has gone
105 * wrong. Warn the user and don't proceed any further.
107 if (!origin)
108 for_each_string_list_item(item, remotes)
109 if (skip_prefix(item->string, "refs/heads/", &shortname)
110 && !strcmp(local, shortname)) {
111 warning(_("not setting branch '%s' as its own upstream"),
112 local);
113 return 0;
116 strbuf_addf(&key, "branch.%s.remote", local);
117 if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
118 goto out_err;
120 strbuf_reset(&key);
121 strbuf_addf(&key, "branch.%s.merge", local);
123 * We want to overwrite any existing config with all the branches in
124 * "remotes". Override any existing config, then write our branches. If
125 * more than one is provided, use CONFIG_REGEX_NONE to preserve what
126 * we've written so far.
128 if (git_config_set_gently(key.buf, NULL) < 0)
129 goto out_err;
130 for_each_string_list_item(item, remotes)
131 if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0)
132 goto out_err;
134 if (rebasing) {
135 strbuf_reset(&key);
136 strbuf_addf(&key, "branch.%s.rebase", local);
137 if (git_config_set_gently(key.buf, "true") < 0)
138 goto out_err;
140 strbuf_release(&key);
142 if (flag & BRANCH_CONFIG_VERBOSE) {
143 struct strbuf tmp_ref_name = STRBUF_INIT;
144 struct string_list friendly_ref_names = STRING_LIST_INIT_DUP;
146 for_each_string_list_item(item, remotes) {
147 shortname = item->string;
148 skip_prefix(shortname, "refs/heads/", &shortname);
149 if (origin) {
150 strbuf_addf(&tmp_ref_name, "%s/%s",
151 origin, shortname);
152 string_list_append_nodup(
153 &friendly_ref_names,
154 strbuf_detach(&tmp_ref_name, NULL));
155 } else {
156 string_list_append(
157 &friendly_ref_names, shortname);
161 if (remotes->nr == 1) {
163 * Rebasing is only allowed in the case of a single
164 * upstream branch.
166 printf_ln(rebasing ?
167 _("branch '%s' set up to track '%s' by rebasing.") :
168 _("branch '%s' set up to track '%s'."),
169 local, friendly_ref_names.items[0].string);
170 } else {
171 printf_ln(_("branch '%s' set up to track:"), local);
172 for_each_string_list_item(item, &friendly_ref_names)
173 printf_ln(" %s", item->string);
176 string_list_clear(&friendly_ref_names, 0);
179 return 0;
181 out_err:
182 strbuf_release(&key);
183 error(_("unable to write upstream branch configuration"));
185 advise(_("\nAfter fixing the error cause you may try to fix up\n"
186 "the remote tracking information by invoking:"));
187 if (remotes->nr == 1)
188 advise(" git branch --set-upstream-to=%s%s%s",
189 origin ? origin : "",
190 origin ? "/" : "",
191 remotes->items[0].string);
192 else {
193 advise(" git config --add branch.\"%s\".remote %s",
194 local, origin ? origin : ".");
195 for_each_string_list_item(item, remotes)
196 advise(" git config --add branch.\"%s\".merge %s",
197 local, item->string);
200 return -1;
203 int install_branch_config(int flag, const char *local, const char *origin,
204 const char *remote)
206 int ret;
207 struct string_list remotes = STRING_LIST_INIT_DUP;
209 string_list_append(&remotes, remote);
210 ret = install_branch_config_multiple_remotes(flag, local, origin, &remotes);
211 string_list_clear(&remotes, 0);
212 return ret;
215 static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
217 const char *bare_ref;
218 struct branch *branch;
219 int i;
221 bare_ref = orig_ref;
222 skip_prefix(orig_ref, "refs/heads/", &bare_ref);
224 branch = branch_get(bare_ref);
225 if (!branch->remote_name) {
226 warning(_("asked to inherit tracking from '%s', but no remote is set"),
227 bare_ref);
228 return -1;
231 if (branch->merge_nr < 1 || !branch->merge_name || !branch->merge_name[0]) {
232 warning(_("asked to inherit tracking from '%s', but no merge configuration is set"),
233 bare_ref);
234 return -1;
237 tracking->remote = branch->remote_name;
238 for (i = 0; i < branch->merge_nr; i++)
239 string_list_append(tracking->srcs, branch->merge_name[i]);
240 return 0;
244 * Used internally to set the branch.<new_ref>.{remote,merge} config
245 * settings so that branch 'new_ref' tracks 'orig_ref'. Unlike
246 * dwim_and_setup_tracking(), this does not do DWIM, i.e. "origin/main"
247 * will not be expanded to "refs/remotes/origin/main", so it is not safe
248 * for 'orig_ref' to be raw user input.
250 static void setup_tracking(const char *new_ref, const char *orig_ref,
251 enum branch_track track, int quiet)
253 struct tracking tracking;
254 struct string_list tracking_srcs = STRING_LIST_INIT_DUP;
255 int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
256 struct find_tracked_branch_cb ftb_cb = {
257 .tracking = &tracking,
258 .ambiguous_remotes = STRING_LIST_INIT_DUP,
261 if (!track)
262 BUG("asked to set up tracking, but tracking is disallowed");
264 memset(&tracking, 0, sizeof(tracking));
265 tracking.spec.dst = (char *)orig_ref;
266 tracking.srcs = &tracking_srcs;
267 if (track != BRANCH_TRACK_INHERIT)
268 for_each_remote(find_tracked_branch, &ftb_cb);
269 else if (inherit_tracking(&tracking, orig_ref))
270 goto cleanup;
272 if (!tracking.matches)
273 switch (track) {
274 /* If ref is not remote, still use local */
275 case BRANCH_TRACK_ALWAYS:
276 case BRANCH_TRACK_EXPLICIT:
277 case BRANCH_TRACK_OVERRIDE:
278 /* Remote matches not evaluated */
279 case BRANCH_TRACK_INHERIT:
280 break;
281 /* Otherwise, if no remote don't track */
282 default:
283 goto cleanup;
287 * This check does not apply to BRANCH_TRACK_INHERIT;
288 * that supports multiple entries in tracking_srcs but
289 * leaves tracking.matches at 0.
291 if (tracking.matches > 1) {
292 int status = die_message(_("not tracking: ambiguous information for ref '%s'"),
293 orig_ref);
294 if (advice_enabled(ADVICE_AMBIGUOUS_FETCH_REFSPEC)) {
295 struct strbuf remotes_advice = STRBUF_INIT;
296 struct string_list_item *item;
298 for_each_string_list_item(item, &ftb_cb.ambiguous_remotes)
300 * TRANSLATORS: This is a line listing a remote with duplicate
301 * refspecs in the advice message below. For RTL languages you'll
302 * probably want to swap the "%s" and leading " " space around.
304 strbuf_addf(&remotes_advice, _(" %s\n"), item->string);
307 * TRANSLATORS: The second argument is a \n-delimited list of
308 * duplicate refspecs, composed above.
310 advise(_("There are multiple remotes whose fetch refspecs map to the remote\n"
311 "tracking ref '%s':\n"
312 "%s"
313 "\n"
314 "This is typically a configuration error.\n"
315 "\n"
316 "To support setting up tracking branches, ensure that\n"
317 "different remotes' fetch refspecs map into different\n"
318 "tracking namespaces."), orig_ref,
319 remotes_advice.buf);
320 strbuf_release(&remotes_advice);
322 exit(status);
325 if (track == BRANCH_TRACK_SIMPLE) {
327 * Only track if remote branch name matches.
328 * Reaching into items[0].string is safe because
329 * we know there is at least one and not more than
330 * one entry (because only BRANCH_TRACK_INHERIT can
331 * produce more than one entry).
333 const char *tracked_branch;
334 if (!skip_prefix(tracking.srcs->items[0].string,
335 "refs/heads/", &tracked_branch) ||
336 strcmp(tracked_branch, new_ref))
337 goto cleanup;
340 if (tracking.srcs->nr < 1)
341 string_list_append(tracking.srcs, orig_ref);
342 if (install_branch_config_multiple_remotes(config_flags, new_ref,
343 tracking.remote, tracking.srcs) < 0)
344 exit(1);
346 cleanup:
347 string_list_clear(&tracking_srcs, 0);
348 string_list_clear(&ftb_cb.ambiguous_remotes, 0);
351 int read_branch_desc(struct strbuf *buf, const char *branch_name)
353 char *v = NULL;
354 struct strbuf name = STRBUF_INIT;
355 strbuf_addf(&name, "branch.%s.description", branch_name);
356 if (git_config_get_string(name.buf, &v)) {
357 strbuf_release(&name);
358 return -1;
360 strbuf_addstr(buf, v);
361 free(v);
362 strbuf_release(&name);
363 return 0;
367 * Check if 'name' can be a valid name for a branch; die otherwise.
368 * Return 1 if the named branch already exists; return 0 otherwise.
369 * Fill ref with the full refname for the branch.
371 int validate_branchname(const char *name, struct strbuf *ref)
373 if (strbuf_check_branch_ref(ref, name)) {
374 int code = die_message(_("'%s' is not a valid branch name"), name);
375 advise_if_enabled(ADVICE_REF_SYNTAX,
376 _("See `man git check-ref-format`"));
377 exit(code);
380 return refs_ref_exists(get_main_ref_store(the_repository), ref->buf);
383 static int initialized_checked_out_branches;
384 static struct strmap current_checked_out_branches = STRMAP_INIT;
386 static void prepare_checked_out_branches(void)
388 int i = 0;
389 struct worktree **worktrees;
391 if (initialized_checked_out_branches)
392 return;
393 initialized_checked_out_branches = 1;
395 worktrees = get_worktrees();
397 while (worktrees[i]) {
398 char *old;
399 struct wt_status_state state = { 0 };
400 struct worktree *wt = worktrees[i++];
401 struct string_list update_refs = STRING_LIST_INIT_DUP;
403 if (wt->is_bare)
404 continue;
406 if (wt->head_ref) {
407 old = strmap_put(&current_checked_out_branches,
408 wt->head_ref,
409 xstrdup(wt->path));
410 free(old);
413 if (wt_status_check_rebase(wt, &state) &&
414 (state.rebase_in_progress || state.rebase_interactive_in_progress) &&
415 state.branch) {
416 struct strbuf ref = STRBUF_INIT;
417 strbuf_addf(&ref, "refs/heads/%s", state.branch);
418 old = strmap_put(&current_checked_out_branches,
419 ref.buf,
420 xstrdup(wt->path));
421 free(old);
422 strbuf_release(&ref);
424 wt_status_state_free_buffers(&state);
426 if (wt_status_check_bisect(wt, &state) &&
427 state.bisecting_from) {
428 struct strbuf ref = STRBUF_INIT;
429 strbuf_addf(&ref, "refs/heads/%s", state.bisecting_from);
430 old = strmap_put(&current_checked_out_branches,
431 ref.buf,
432 xstrdup(wt->path));
433 free(old);
434 strbuf_release(&ref);
436 wt_status_state_free_buffers(&state);
438 if (!sequencer_get_update_refs_state(get_worktree_git_dir(wt),
439 &update_refs)) {
440 struct string_list_item *item;
441 for_each_string_list_item(item, &update_refs) {
442 old = strmap_put(&current_checked_out_branches,
443 item->string,
444 xstrdup(wt->path));
445 free(old);
447 string_list_clear(&update_refs, 1);
451 free_worktrees(worktrees);
454 const char *branch_checked_out(const char *refname)
456 prepare_checked_out_branches();
457 return strmap_get(&current_checked_out_branches, refname);
461 * Check if a branch 'name' can be created as a new branch; die otherwise.
462 * 'force' can be used when it is OK for the named branch already exists.
463 * Return 1 if the named branch already exists; return 0 otherwise.
464 * Fill ref with the full refname for the branch.
466 int validate_new_branchname(const char *name, struct strbuf *ref, int force)
468 const char *path;
469 if (!validate_branchname(name, ref))
470 return 0;
472 if (!force)
473 die(_("a branch named '%s' already exists"),
474 ref->buf + strlen("refs/heads/"));
476 if ((path = branch_checked_out(ref->buf)))
477 die(_("cannot force update the branch '%s' "
478 "used by worktree at '%s'"),
479 ref->buf + strlen("refs/heads/"), path);
481 return 1;
484 static int check_tracking_branch(struct remote *remote, void *cb_data)
486 char *tracking_branch = cb_data;
487 struct refspec_item query;
488 int res;
489 memset(&query, 0, sizeof(struct refspec_item));
490 query.dst = tracking_branch;
491 res = !remote_find_tracking(remote, &query);
492 free(query.src);
493 return res;
496 static int validate_remote_tracking_branch(char *ref)
498 return !for_each_remote(check_tracking_branch, ref);
501 static const char upstream_not_branch[] =
502 N_("cannot set up tracking information; starting point '%s' is not a branch");
503 static const char upstream_missing[] =
504 N_("the requested upstream branch '%s' does not exist");
505 static const char upstream_advice[] =
506 N_("\n"
507 "If you are planning on basing your work on an upstream\n"
508 "branch that already exists at the remote, you may need to\n"
509 "run \"git fetch\" to retrieve it.\n"
510 "\n"
511 "If you are planning to push out a new local branch that\n"
512 "will track its remote counterpart, you may want to use\n"
513 "\"git push -u\" to set the upstream config as you push.");
516 * DWIMs a user-provided ref to determine the starting point for a
517 * branch and validates it, where:
519 * - r is the repository to validate the branch for
521 * - start_name is the ref that we would like to test. This is
522 * expanded with DWIM and assigned to out_real_ref.
524 * - track is the tracking mode of the new branch. If tracking is
525 * explicitly requested, start_name must be a branch (because
526 * otherwise start_name cannot be tracked)
528 * - out_oid is an out parameter containing the object_id of start_name
530 * - out_real_ref is an out parameter containing the full, 'real' form
531 * of start_name e.g. refs/heads/main instead of main
534 static void dwim_branch_start(struct repository *r, const char *start_name,
535 enum branch_track track, char **out_real_ref,
536 struct object_id *out_oid)
538 struct commit *commit;
539 struct object_id oid;
540 char *real_ref;
541 int explicit_tracking = 0;
543 if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
544 explicit_tracking = 1;
546 real_ref = NULL;
547 if (repo_get_oid_mb(r, start_name, &oid)) {
548 if (explicit_tracking) {
549 int code = die_message(_(upstream_missing), start_name);
550 advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
551 _(upstream_advice));
552 exit(code);
554 die(_("not a valid object name: '%s'"), start_name);
557 switch (repo_dwim_ref(r, start_name, strlen(start_name), &oid,
558 &real_ref, 0)) {
559 case 0:
560 /* Not branching from any existing branch */
561 if (explicit_tracking)
562 die(_(upstream_not_branch), start_name);
563 break;
564 case 1:
565 /* Unique completion -- good, only if it is a real branch */
566 if (!starts_with(real_ref, "refs/heads/") &&
567 validate_remote_tracking_branch(real_ref)) {
568 if (explicit_tracking)
569 die(_(upstream_not_branch), start_name);
570 else
571 FREE_AND_NULL(real_ref);
573 break;
574 default:
575 die(_("ambiguous object name: '%s'"), start_name);
576 break;
579 if (!(commit = lookup_commit_reference(r, &oid)))
580 die(_("not a valid branch point: '%s'"), start_name);
581 if (out_real_ref) {
582 *out_real_ref = real_ref;
583 real_ref = NULL;
585 if (out_oid)
586 oidcpy(out_oid, &commit->object.oid);
588 FREE_AND_NULL(real_ref);
591 void create_branch(struct repository *r,
592 const char *name, const char *start_name,
593 int force, int clobber_head_ok, int reflog,
594 int quiet, enum branch_track track, int dry_run)
596 struct object_id oid;
597 char *real_ref;
598 struct strbuf ref = STRBUF_INIT;
599 int forcing = 0;
600 struct ref_transaction *transaction;
601 struct strbuf err = STRBUF_INIT;
602 char *msg;
604 if (track == BRANCH_TRACK_OVERRIDE)
605 BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
606 if (clobber_head_ok && !force)
607 BUG("'clobber_head_ok' can only be used with 'force'");
609 if (clobber_head_ok ?
610 validate_branchname(name, &ref) :
611 validate_new_branchname(name, &ref, force)) {
612 forcing = 1;
615 dwim_branch_start(r, start_name, track, &real_ref, &oid);
616 if (dry_run)
617 goto cleanup;
619 if (reflog)
620 log_all_ref_updates = LOG_REFS_NORMAL;
622 if (forcing)
623 msg = xstrfmt("branch: Reset to %s", start_name);
624 else
625 msg = xstrfmt("branch: Created from %s", start_name);
626 transaction = ref_store_transaction_begin(get_main_ref_store(the_repository),
627 &err);
628 if (!transaction ||
629 ref_transaction_update(transaction, ref.buf,
630 &oid, forcing ? NULL : null_oid(),
631 NULL, NULL, 0, msg, &err) ||
632 ref_transaction_commit(transaction, &err))
633 die("%s", err.buf);
634 ref_transaction_free(transaction);
635 strbuf_release(&err);
636 free(msg);
638 if (real_ref && track)
639 setup_tracking(ref.buf + 11, real_ref, track, quiet);
641 cleanup:
642 strbuf_release(&ref);
643 free(real_ref);
646 void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
647 const char *orig_ref, enum branch_track track,
648 int quiet)
650 char *real_orig_ref = NULL;
651 dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
652 setup_tracking(new_ref, real_orig_ref, track, quiet);
653 free(real_orig_ref);
657 * Creates a branch in a submodule by calling
658 * create_branches_recursively() in a child process. The child process
659 * is necessary because install_branch_config_multiple_remotes() (which
660 * is called by setup_tracking()) does not support writing configs to
661 * submodules.
663 static int submodule_create_branch(struct repository *r,
664 const struct submodule *submodule,
665 const char *name, const char *start_oid,
666 const char *tracking_name, int force,
667 int reflog, int quiet,
668 enum branch_track track, int dry_run)
670 int ret = 0;
671 struct child_process child = CHILD_PROCESS_INIT;
672 struct strbuf child_err = STRBUF_INIT;
673 struct strbuf out_buf = STRBUF_INIT;
674 char *out_prefix = xstrfmt("submodule '%s': ", submodule->name);
675 child.git_cmd = 1;
676 child.err = -1;
677 child.stdout_to_stderr = 1;
679 prepare_other_repo_env(&child.env, r->gitdir);
681 * submodule_create_branch() is indirectly invoked by "git
682 * branch", but we cannot invoke "git branch" in the child
683 * process. "git branch" accepts a branch name and start point,
684 * where the start point is assumed to provide both the OID
685 * (start_oid) and the branch to use for tracking
686 * (tracking_name). But when recursing through submodules,
687 * start_oid and tracking name need to be specified separately
688 * (see create_branches_recursively()).
690 strvec_pushl(&child.args, "submodule--helper", "create-branch", NULL);
691 if (dry_run)
692 strvec_push(&child.args, "--dry-run");
693 if (force)
694 strvec_push(&child.args, "--force");
695 if (quiet)
696 strvec_push(&child.args, "--quiet");
697 if (reflog)
698 strvec_push(&child.args, "--create-reflog");
700 switch (track) {
701 case BRANCH_TRACK_NEVER:
702 strvec_push(&child.args, "--no-track");
703 break;
704 case BRANCH_TRACK_ALWAYS:
705 case BRANCH_TRACK_EXPLICIT:
706 strvec_push(&child.args, "--track=direct");
707 break;
708 case BRANCH_TRACK_OVERRIDE:
709 BUG("BRANCH_TRACK_OVERRIDE cannot be used when creating a branch.");
710 break;
711 case BRANCH_TRACK_INHERIT:
712 strvec_push(&child.args, "--track=inherit");
713 break;
714 case BRANCH_TRACK_UNSPECIFIED:
715 /* Default for "git checkout". Do not pass --track. */
716 case BRANCH_TRACK_REMOTE:
717 /* Default for "git branch". Do not pass --track. */
718 case BRANCH_TRACK_SIMPLE:
719 /* Config-driven only. Do not pass --track. */
720 break;
723 strvec_pushl(&child.args, name, start_oid, tracking_name, NULL);
725 if ((ret = start_command(&child)))
726 return ret;
727 ret = finish_command(&child);
728 strbuf_read(&child_err, child.err, 0);
729 strbuf_add_lines(&out_buf, out_prefix, child_err.buf, child_err.len);
731 if (ret)
732 fprintf(stderr, "%s", out_buf.buf);
733 else
734 printf("%s", out_buf.buf);
736 strbuf_release(&child_err);
737 strbuf_release(&out_buf);
738 return ret;
741 void create_branches_recursively(struct repository *r, const char *name,
742 const char *start_committish,
743 const char *tracking_name, int force,
744 int reflog, int quiet, enum branch_track track,
745 int dry_run)
747 int i = 0;
748 char *branch_point = NULL;
749 struct object_id super_oid;
750 struct submodule_entry_list submodule_entry_list;
752 /* Perform dwim on start_committish to get super_oid and branch_point. */
753 dwim_branch_start(r, start_committish, BRANCH_TRACK_NEVER,
754 &branch_point, &super_oid);
757 * If we were not given an explicit name to track, then assume we are at
758 * the top level and, just like the non-recursive case, the tracking
759 * name is the branch point.
761 if (!tracking_name)
762 tracking_name = branch_point;
764 submodules_of_tree(r, &super_oid, &submodule_entry_list);
766 * Before creating any branches, first check that the branch can
767 * be created in every submodule.
769 for (i = 0; i < submodule_entry_list.entry_nr; i++) {
770 if (!submodule_entry_list.entries[i].repo) {
771 int code = die_message(
772 _("submodule '%s': unable to find submodule"),
773 submodule_entry_list.entries[i].submodule->name);
774 if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
775 advise(_("You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'"),
776 start_committish);
777 exit(code);
780 if (submodule_create_branch(
781 submodule_entry_list.entries[i].repo,
782 submodule_entry_list.entries[i].submodule, name,
783 oid_to_hex(&submodule_entry_list.entries[i]
784 .name_entry->oid),
785 tracking_name, force, reflog, quiet, track, 1))
786 die(_("submodule '%s': cannot create branch '%s'"),
787 submodule_entry_list.entries[i].submodule->name,
788 name);
791 create_branch(r, name, start_committish, force, 0, reflog, quiet,
792 BRANCH_TRACK_NEVER, dry_run);
793 if (dry_run)
794 return;
796 * NEEDSWORK If tracking was set up in the superproject but not the
797 * submodule, users might expect "git branch --recurse-submodules" to
798 * fail or give a warning, but this is not yet implemented because it is
799 * tedious to determine whether or not tracking was set up in the
800 * superproject.
802 if (track)
803 setup_tracking(name, tracking_name, track, quiet);
805 for (i = 0; i < submodule_entry_list.entry_nr; i++) {
806 if (submodule_create_branch(
807 submodule_entry_list.entries[i].repo,
808 submodule_entry_list.entries[i].submodule, name,
809 oid_to_hex(&submodule_entry_list.entries[i]
810 .name_entry->oid),
811 tracking_name, force, reflog, quiet, track, 0))
812 die(_("submodule '%s': cannot create branch '%s'"),
813 submodule_entry_list.entries[i].submodule->name,
814 name);
815 repo_clear(submodule_entry_list.entries[i].repo);
819 void remove_merge_branch_state(struct repository *r)
821 unlink(git_path_merge_head(r));
822 unlink(git_path_merge_rr(r));
823 unlink(git_path_merge_msg(r));
824 unlink(git_path_merge_mode(r));
825 refs_delete_ref(get_main_ref_store(r), "", "AUTO_MERGE",
826 NULL, REF_NO_DEREF);
827 save_autostash_ref(r, "MERGE_AUTOSTASH");
830 void remove_branch_state(struct repository *r, int verbose)
832 sequencer_post_commit_cleanup(r, verbose);
833 unlink(git_path_squash_msg(r));
834 remove_merge_branch_state(r);
837 void die_if_checked_out(const char *branch, int ignore_current_worktree)
839 struct worktree **worktrees = get_worktrees();
841 for (int i = 0; worktrees[i]; i++) {
842 if (worktrees[i]->is_current && ignore_current_worktree)
843 continue;
845 if (is_shared_symref(worktrees[i], "HEAD", branch)) {
846 skip_prefix(branch, "refs/heads/", &branch);
847 die(_("'%s' is already used by worktree at '%s'"),
848 branch, worktrees[i]->path);
852 free_worktrees(worktrees);