]> git.ipfire.org Git - thirdparty/git.git/blame - branch.c
branch: add branch_checked_out() helper
[thirdparty/git.git] / branch.c
CommitLineData
303d1d0b 1#include "git-compat-util.h"
e496c003 2#include "cache.h"
b2141fc1 3#include "config.h"
e496c003
DB
4#include "branch.h"
5#include "refs.h"
ec0cb496 6#include "refspec.h"
e496c003 7#include "remote.h"
b07d9bfd 8#include "sequencer.h"
e496c003 9#include "commit.h"
ac6c561b 10#include "worktree.h"
961b130d
GC
11#include "submodule-config.h"
12#include "run-command.h"
31ad6b61 13#include "strmap.h"
e496c003
DB
14
15struct tracking {
0ad4a5ff 16 struct refspec_item spec;
d3115660 17 struct string_list *srcs;
e496c003
DB
18 const char *remote;
19 int matches;
20};
21
e4921d87
TK
22struct find_tracked_branch_cb {
23 struct tracking *tracking;
24 struct string_list ambiguous_remotes;
25};
26
e496c003
DB
27static int find_tracked_branch(struct remote *remote, void *priv)
28{
e4921d87
TK
29 struct find_tracked_branch_cb *ftb = priv;
30 struct tracking *tracking = ftb->tracking;
e496c003
DB
31
32 if (!remote_find_tracking(remote, &tracking->spec)) {
e4921d87
TK
33 switch (++tracking->matches) {
34 case 1:
d3115660 35 string_list_append(tracking->srcs, tracking->spec.src);
e496c003 36 tracking->remote = remote->name;
e4921d87
TK
37 break;
38 case 2:
39 /* there are at least two remotes; backfill the first one */
40 string_list_append(&ftb->ambiguous_remotes, tracking->remote);
41 /* fall through */
42 default:
43 string_list_append(&ftb->ambiguous_remotes, remote->name);
e496c003 44 free(tracking->spec.src);
d3115660 45 string_list_clear(tracking->srcs, 0);
e4921d87 46 break;
e496c003
DB
47 }
48 tracking->spec.src = NULL;
49 }
50
51 return 0;
52}
53
a9f2c136 54static int should_setup_rebase(const char *origin)
c998ae9b
DS
55{
56 switch (autorebase) {
57 case AUTOREBASE_NEVER:
58 return 0;
59 case AUTOREBASE_LOCAL:
a9f2c136 60 return origin == NULL;
c998ae9b 61 case AUTOREBASE_REMOTE:
a9f2c136 62 return origin != NULL;
c998ae9b
DS
63 case AUTOREBASE_ALWAYS:
64 return 1;
65 }
66 return 0;
67}
68
a3f40ec4
JS
69/**
70 * Install upstream tracking configuration for a branch; specifically, add
71 * `branch.<name>.remote` and `branch.<name>.merge` entries.
72 *
73 * `flag` contains integer flags for options; currently only
74 * BRANCH_CONFIG_VERBOSE is checked.
75 *
76 * `local` is the name of the branch whose configuration we're installing.
77 *
78 * `origin` is the name of the remote owning the upstream branches. NULL means
79 * the upstream branches are local to this repo.
80 *
81 * `remotes` is a list of refs that are upstream of local
82 */
83static int install_branch_config_multiple_remotes(int flag, const char *local,
84 const char *origin, struct string_list *remotes)
a9f2c136 85{
cf4fff57 86 const char *shortname = NULL;
a9f2c136 87 struct strbuf key = STRBUF_INIT;
a3f40ec4 88 struct string_list_item *item;
a9f2c136
JH
89 int rebasing = should_setup_rebase(origin);
90
a3f40ec4
JS
91 if (!remotes->nr)
92 BUG("must provide at least one remote for branch config");
93 if (rebasing && remotes->nr > 1)
94 die(_("cannot inherit upstream tracking configuration of "
95 "multiple refs when rebasing is requested"));
96
97 /*
98 * If the new branch is trying to track itself, something has gone
99 * wrong. Warn the user and don't proceed any further.
100 */
101 if (!origin)
102 for_each_string_list_item(item, remotes)
103 if (skip_prefix(item->string, "refs/heads/", &shortname)
104 && !strcmp(local, shortname)) {
0669bdf4 105 warning(_("not setting branch '%s' as its own upstream"),
a3f40ec4
JS
106 local);
107 return 0;
108 }
85e2233f 109
a9f2c136 110 strbuf_addf(&key, "branch.%s.remote", local);
30598ad0 111 if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
27852b2c 112 goto out_err;
a9f2c136
JH
113
114 strbuf_reset(&key);
115 strbuf_addf(&key, "branch.%s.merge", local);
a3f40ec4
JS
116 /*
117 * We want to overwrite any existing config with all the branches in
118 * "remotes". Override any existing config, then write our branches. If
119 * more than one is provided, use CONFIG_REGEX_NONE to preserve what
120 * we've written so far.
121 */
122 if (git_config_set_gently(key.buf, NULL) < 0)
27852b2c 123 goto out_err;
a3f40ec4
JS
124 for_each_string_list_item(item, remotes)
125 if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0)
126 goto out_err;
a9f2c136
JH
127
128 if (rebasing) {
129 strbuf_reset(&key);
130 strbuf_addf(&key, "branch.%s.rebase", local);
30598ad0 131 if (git_config_set_gently(key.buf, "true") < 0)
27852b2c 132 goto out_err;
a9f2c136 133 }
d53a3503 134 strbuf_release(&key);
a9f2c136 135
72f60083 136 if (flag & BRANCH_CONFIG_VERBOSE) {
a3f40ec4
JS
137 struct strbuf tmp_ref_name = STRBUF_INIT;
138 struct string_list friendly_ref_names = STRING_LIST_INIT_DUP;
139
140 for_each_string_list_item(item, remotes) {
141 shortname = item->string;
142 skip_prefix(shortname, "refs/heads/", &shortname);
143 if (origin) {
144 strbuf_addf(&tmp_ref_name, "%s/%s",
145 origin, shortname);
146 string_list_append_nodup(
147 &friendly_ref_names,
148 strbuf_detach(&tmp_ref_name, NULL));
149 } else {
150 string_list_append(
151 &friendly_ref_names, shortname);
152 }
153 }
154
155 if (remotes->nr == 1) {
156 /*
157 * Rebasing is only allowed in the case of a single
158 * upstream branch.
159 */
160 printf_ln(rebasing ?
161 _("branch '%s' set up to track '%s' by rebasing.") :
162 _("branch '%s' set up to track '%s'."),
163 local, friendly_ref_names.items[0].string);
9fe0cf3a 164 } else {
a3f40ec4
JS
165 printf_ln(_("branch '%s' set up to track:"), local);
166 for_each_string_list_item(item, &friendly_ref_names)
167 printf_ln(" %s", item->string);
9fe0cf3a 168 }
a3f40ec4
JS
169
170 string_list_clear(&friendly_ref_names, 0);
72f60083 171 }
27852b2c
PS
172
173 return 0;
174
175out_err:
176 strbuf_release(&key);
7435e7e2 177 error(_("unable to write upstream branch configuration"));
27852b2c 178
a3f40ec4
JS
179 advise(_("\nAfter fixing the error cause you may try to fix up\n"
180 "the remote tracking information by invoking:"));
181 if (remotes->nr == 1)
182 advise(" git branch --set-upstream-to=%s%s%s",
183 origin ? origin : "",
184 origin ? "/" : "",
185 remotes->items[0].string);
186 else {
187 advise(" git config --add branch.\"%s\".remote %s",
188 local, origin ? origin : ".");
189 for_each_string_list_item(item, remotes)
190 advise(" git config --add branch.\"%s\".merge %s",
191 local, item->string);
192 }
27852b2c
PS
193
194 return -1;
a9f2c136
JH
195}
196
a3f40ec4
JS
197int install_branch_config(int flag, const char *local, const char *origin,
198 const char *remote)
199{
200 int ret;
201 struct string_list remotes = STRING_LIST_INIT_DUP;
202
203 string_list_append(&remotes, remote);
204 ret = install_branch_config_multiple_remotes(flag, local, origin, &remotes);
205 string_list_clear(&remotes, 0);
206 return ret;
207}
208
d3115660
JS
209static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
210{
211 const char *bare_ref;
212 struct branch *branch;
213 int i;
214
215 bare_ref = orig_ref;
216 skip_prefix(orig_ref, "refs/heads/", &bare_ref);
217
218 branch = branch_get(bare_ref);
219 if (!branch->remote_name) {
220 warning(_("asked to inherit tracking from '%s', but no remote is set"),
221 bare_ref);
222 return -1;
223 }
224
225 if (branch->merge_nr < 1 || !branch->merge_name || !branch->merge_name[0]) {
226 warning(_("asked to inherit tracking from '%s', but no merge configuration is set"),
227 bare_ref);
228 return -1;
229 }
230
231 tracking->remote = xstrdup(branch->remote_name);
232 for (i = 0; i < branch->merge_nr; i++)
233 string_list_append(tracking->srcs, branch->merge_name[i]);
234 return 0;
235}
236
e496c003 237/*
e89f151d
GC
238 * Used internally to set the branch.<new_ref>.{remote,merge} config
239 * settings so that branch 'new_ref' tracks 'orig_ref'. Unlike
240 * dwim_and_setup_tracking(), this does not do DWIM, i.e. "origin/main"
241 * will not be expanded to "refs/remotes/origin/main", so it is not safe
242 * for 'orig_ref' to be raw user input.
e496c003 243 */
27852b2c
PS
244static void setup_tracking(const char *new_ref, const char *orig_ref,
245 enum branch_track track, int quiet)
e496c003 246{
e496c003 247 struct tracking tracking;
d3115660 248 struct string_list tracking_srcs = STRING_LIST_INIT_DUP;
f9a482e6 249 int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
e4921d87
TK
250 struct find_tracked_branch_cb ftb_cb = {
251 .tracking = &tracking,
252 .ambiguous_remotes = STRING_LIST_INIT_DUP,
253 };
e496c003 254
75388bf5
GC
255 if (!track)
256 BUG("asked to set up tracking, but tracking is disallowed");
257
e496c003
DB
258 memset(&tracking, 0, sizeof(tracking));
259 tracking.spec.dst = (char *)orig_ref;
d3115660
JS
260 tracking.srcs = &tracking_srcs;
261 if (track != BRANCH_TRACK_INHERIT)
e4921d87 262 for_each_remote(find_tracked_branch, &ftb_cb);
d3115660 263 else if (inherit_tracking(&tracking, orig_ref))
679e3693 264 goto cleanup;
e496c003 265
9ed36cfa
JS
266 if (!tracking.matches)
267 switch (track) {
268 case BRANCH_TRACK_ALWAYS:
269 case BRANCH_TRACK_EXPLICIT:
4fc50066 270 case BRANCH_TRACK_OVERRIDE:
d3115660 271 case BRANCH_TRACK_INHERIT:
9ed36cfa
JS
272 break;
273 default:
679e3693 274 goto cleanup;
9ed36cfa
JS
275 }
276
e4921d87
TK
277 if (tracking.matches > 1) {
278 int status = die_message(_("not tracking: ambiguous information for ref '%s'"),
279 orig_ref);
280 if (advice_enabled(ADVICE_AMBIGUOUS_FETCH_REFSPEC)) {
281 struct strbuf remotes_advice = STRBUF_INIT;
282 struct string_list_item *item;
283
284 for_each_string_list_item(item, &ftb_cb.ambiguous_remotes)
285 /*
286 * TRANSLATORS: This is a line listing a remote with duplicate
287 * refspecs in the advice message below. For RTL languages you'll
288 * probably want to swap the "%s" and leading " " space around.
289 */
290 strbuf_addf(&remotes_advice, _(" %s\n"), item->string);
291
292 /*
293 * TRANSLATORS: The second argument is a \n-delimited list of
294 * duplicate refspecs, composed above.
295 */
296 advise(_("There are multiple remotes whose fetch refspecs map to the remote\n"
297 "tracking ref '%s':\n"
298 "%s"
299 "\n"
300 "This is typically a configuration error.\n"
301 "\n"
302 "To support setting up tracking branches, ensure that\n"
303 "different remotes' fetch refspecs map into different\n"
304 "tracking namespaces."), orig_ref,
305 remotes_advice.buf);
306 strbuf_release(&remotes_advice);
307 }
308 exit(status);
309 }
e496c003 310
d3115660
JS
311 if (tracking.srcs->nr < 1)
312 string_list_append(tracking.srcs, orig_ref);
313 if (install_branch_config_multiple_remotes(config_flags, new_ref,
314 tracking.remote, tracking.srcs) < 0)
5391e948 315 exit(1);
e496c003 316
679e3693
GC
317cleanup:
318 string_list_clear(&tracking_srcs, 0);
e4921d87 319 string_list_clear(&ftb_cb.ambiguous_remotes, 0);
e496c003
DB
320}
321
6f9a3321
JH
322int read_branch_desc(struct strbuf *buf, const char *branch_name)
323{
540b0f49 324 char *v = NULL;
6f9a3321
JH
325 struct strbuf name = STRBUF_INIT;
326 strbuf_addf(&name, "branch.%s.description", branch_name);
540b0f49
TA
327 if (git_config_get_string(name.buf, &v)) {
328 strbuf_release(&name);
329 return -1;
330 }
331 strbuf_addstr(buf, v);
332 free(v);
6f9a3321
JH
333 strbuf_release(&name);
334 return 0;
335}
336
bc1c9c0e
JH
337/*
338 * Check if 'name' can be a valid name for a branch; die otherwise.
339 * Return 1 if the named branch already exists; return 0 otherwise.
340 * Fill ref with the full refname for the branch.
341 */
342int validate_branchname(const char *name, struct strbuf *ref)
55c4a673 343{
55c4a673 344 if (strbuf_check_branch_ref(ref, name))
7435e7e2 345 die(_("'%s' is not a valid branch name"), name);
55c4a673 346
bc1c9c0e
JH
347 return ref_exists(ref->buf);
348}
55c4a673 349
31ad6b61
DS
350static int initialized_checked_out_branches;
351static struct strmap current_checked_out_branches = STRMAP_INIT;
352
353static void prepare_checked_out_branches(void)
354{
355 int i = 0;
356 struct worktree **worktrees;
357
358 if (initialized_checked_out_branches)
359 return;
360 initialized_checked_out_branches = 1;
361
362 worktrees = get_worktrees();
363
364 while (worktrees[i]) {
365 struct worktree *wt = worktrees[i++];
366
367 if (wt->is_bare)
368 continue;
369
370 if (wt->head_ref)
371 strmap_put(&current_checked_out_branches,
372 wt->head_ref,
373 xstrdup(wt->path));
374 }
375
376 free_worktrees(worktrees);
377}
378
379const char *branch_checked_out(const char *refname)
380{
381 prepare_checked_out_branches();
382 return strmap_get(&current_checked_out_branches, refname);
383}
384
bc1c9c0e
JH
385/*
386 * Check if a branch 'name' can be created as a new branch; die otherwise.
387 * 'force' can be used when it is OK for the named branch already exists.
388 * Return 1 if the named branch already exists; return 0 otherwise.
389 * Fill ref with the full refname for the branch.
390 */
391int validate_new_branchname(const char *name, struct strbuf *ref, int force)
392{
593a2a5d
AK
393 struct worktree **worktrees;
394 const struct worktree *wt;
bc1c9c0e
JH
395
396 if (!validate_branchname(name, ref))
55c4a673 397 return 0;
55c4a673 398
8280c4c1 399 if (!force)
7435e7e2 400 die(_("a branch named '%s' already exists"),
8280c4c1
JH
401 ref->buf + strlen("refs/heads/"));
402
593a2a5d
AK
403 worktrees = get_worktrees();
404 wt = find_shared_symref(worktrees, "HEAD", ref->buf);
405 if (wt && !wt->is_bare)
68d924e1 406 die(_("cannot force update the branch '%s' "
593a2a5d
AK
407 "checked out at '%s'"),
408 ref->buf + strlen("refs/heads/"), wt->path);
409 free_worktrees(worktrees);
55c4a673
CI
410
411 return 1;
412}
413
41c21f22
JH
414static int check_tracking_branch(struct remote *remote, void *cb_data)
415{
416 char *tracking_branch = cb_data;
0ad4a5ff
BW
417 struct refspec_item query;
418 memset(&query, 0, sizeof(struct refspec_item));
41c21f22 419 query.dst = tracking_branch;
1d7358c5 420 return !remote_find_tracking(remote, &query);
41c21f22
JH
421}
422
423static int validate_remote_tracking_branch(char *ref)
424{
425 return !for_each_remote(check_tracking_branch, ref);
426}
427
e2b6aa5f 428static const char upstream_not_branch[] =
7435e7e2 429N_("cannot set up tracking information; starting point '%s' is not a branch");
a5e91c72 430static const char upstream_missing[] =
caa2036b
JK
431N_("the requested upstream branch '%s' does not exist");
432static const char upstream_advice[] =
433N_("\n"
434"If you are planning on basing your work on an upstream\n"
435"branch that already exists at the remote, you may need to\n"
436"run \"git fetch\" to retrieve it.\n"
437"\n"
438"If you are planning to push out a new local branch that\n"
439"will track its remote counterpart, you may want to use\n"
440"\"git push -u\" to set the upstream config as you push.");
e2b6aa5f 441
e89f151d
GC
442/**
443 * DWIMs a user-provided ref to determine the starting point for a
444 * branch and validates it, where:
445 *
446 * - r is the repository to validate the branch for
447 *
448 * - start_name is the ref that we would like to test. This is
449 * expanded with DWIM and assigned to out_real_ref.
450 *
451 * - track is the tracking mode of the new branch. If tracking is
452 * explicitly requested, start_name must be a branch (because
453 * otherwise start_name cannot be tracked)
454 *
455 * - out_oid is an out parameter containing the object_id of start_name
456 *
457 * - out_real_ref is an out parameter containing the full, 'real' form
458 * of start_name e.g. refs/heads/main instead of main
459 *
460 */
461static void dwim_branch_start(struct repository *r, const char *start_name,
462 enum branch_track track, char **out_real_ref,
463 struct object_id *out_oid)
e496c003 464{
e496c003 465 struct commit *commit;
48713bfa 466 struct object_id oid;
3818b258 467 char *real_ref;
4fc50066
IL
468 int explicit_tracking = 0;
469
470 if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
471 explicit_tracking = 1;
e496c003 472
e496c003 473 real_ref = NULL;
e3d6539d 474 if (get_oid_mb(start_name, &oid)) {
caa2036b 475 if (explicit_tracking) {
66966012
GC
476 int code = die_message(_(upstream_missing), start_name);
477 advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
478 _(upstream_advice));
479 exit(code);
caa2036b 480 }
7435e7e2 481 die(_("not a valid object name: '%s'"), start_name);
a5e91c72 482 }
e496c003 483
f24c30e0 484 switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) {
e496c003
DB
485 case 0:
486 /* Not branching from any existing branch */
4fc50066 487 if (explicit_tracking)
1a15d00b 488 die(_(upstream_not_branch), start_name);
e496c003
DB
489 break;
490 case 1:
21b5b1e8 491 /* Unique completion -- good, only if it is a real branch */
59556548 492 if (!starts_with(real_ref, "refs/heads/") &&
41c21f22 493 validate_remote_tracking_branch(real_ref)) {
21b5b1e8 494 if (explicit_tracking)
1a15d00b 495 die(_(upstream_not_branch), start_name);
21b5b1e8 496 else
d895804b 497 FREE_AND_NULL(real_ref);
21b5b1e8 498 }
e496c003
DB
499 break;
500 default:
7435e7e2 501 die(_("ambiguous object name: '%s'"), start_name);
e496c003
DB
502 break;
503 }
504
afe8a907 505 if (!(commit = lookup_commit_reference(r, &oid)))
7435e7e2 506 die(_("not a valid branch point: '%s'"), start_name);
e89f151d
GC
507 if (out_real_ref) {
508 *out_real_ref = real_ref;
509 real_ref = NULL;
510 }
511 if (out_oid)
512 oidcpy(out_oid, &commit->object.oid);
513
514 FREE_AND_NULL(real_ref);
515}
516
517void create_branch(struct repository *r,
518 const char *name, const char *start_name,
519 int force, int clobber_head_ok, int reflog,
3f3e7608 520 int quiet, enum branch_track track, int dry_run)
e89f151d
GC
521{
522 struct object_id oid;
523 char *real_ref;
524 struct strbuf ref = STRBUF_INIT;
525 int forcing = 0;
bc0893cf
GC
526 struct ref_transaction *transaction;
527 struct strbuf err = STRBUF_INIT;
528 char *msg;
529
530 if (track == BRANCH_TRACK_OVERRIDE)
531 BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
532 if (clobber_head_ok && !force)
533 BUG("'clobber_head_ok' can only be used with 'force'");
534
535 if (clobber_head_ok ?
536 validate_branchname(name, &ref) :
537 validate_new_branchname(name, &ref, force)) {
538 forcing = 1;
e89f151d
GC
539 }
540
541 dwim_branch_start(r, start_name, track, &real_ref, &oid);
3f3e7608
GC
542 if (dry_run)
543 goto cleanup;
e496c003 544
d43f990f 545 if (reflog)
341fb286 546 log_all_ref_updates = LOG_REFS_NORMAL;
d43f990f 547
bc0893cf
GC
548 if (forcing)
549 msg = xstrfmt("branch: Reset to %s", start_name);
550 else
551 msg = xstrfmt("branch: Created from %s", start_name);
552 transaction = ref_transaction_begin(&err);
553 if (!transaction ||
554 ref_transaction_update(transaction, ref.buf,
555 &oid, forcing ? NULL : null_oid(),
556 0, msg, &err) ||
557 ref_transaction_commit(transaction, &err))
558 die("%s", err.buf);
559 ref_transaction_free(transaction);
560 strbuf_release(&err);
561 free(msg);
d43f990f 562
e496c003 563 if (real_ref && track)
82a0672f 564 setup_tracking(ref.buf + 11, real_ref, track, quiet);
e496c003 565
3f3e7608 566cleanup:
8415d5c7 567 strbuf_release(&ref);
9ed36cfa 568 free(real_ref);
e496c003 569}
c369e7b8 570
e89f151d
GC
571void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
572 const char *orig_ref, enum branch_track track,
573 int quiet)
574{
575 char *real_orig_ref;
576 dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
577 setup_tracking(new_ref, real_orig_ref, track, quiet);
578}
579
961b130d
GC
580/**
581 * Creates a branch in a submodule by calling
582 * create_branches_recursively() in a child process. The child process
583 * is necessary because install_branch_config_multiple_remotes() (which
584 * is called by setup_tracking()) does not support writing configs to
585 * submodules.
586 */
587static int submodule_create_branch(struct repository *r,
588 const struct submodule *submodule,
589 const char *name, const char *start_oid,
590 const char *tracking_name, int force,
591 int reflog, int quiet,
592 enum branch_track track, int dry_run)
593{
594 int ret = 0;
595 struct child_process child = CHILD_PROCESS_INIT;
596 struct strbuf child_err = STRBUF_INIT;
597 struct strbuf out_buf = STRBUF_INIT;
598 char *out_prefix = xstrfmt("submodule '%s': ", submodule->name);
599 child.git_cmd = 1;
600 child.err = -1;
601 child.stdout_to_stderr = 1;
602
603 prepare_other_repo_env(&child.env_array, r->gitdir);
604 /*
605 * submodule_create_branch() is indirectly invoked by "git
606 * branch", but we cannot invoke "git branch" in the child
607 * process. "git branch" accepts a branch name and start point,
608 * where the start point is assumed to provide both the OID
609 * (start_oid) and the branch to use for tracking
610 * (tracking_name). But when recursing through submodules,
611 * start_oid and tracking name need to be specified separately
612 * (see create_branches_recursively()).
613 */
614 strvec_pushl(&child.args, "submodule--helper", "create-branch", NULL);
615 if (dry_run)
616 strvec_push(&child.args, "--dry-run");
617 if (force)
618 strvec_push(&child.args, "--force");
619 if (quiet)
620 strvec_push(&child.args, "--quiet");
621 if (reflog)
622 strvec_push(&child.args, "--create-reflog");
75388bf5
GC
623
624 switch (track) {
625 case BRANCH_TRACK_NEVER:
626 strvec_push(&child.args, "--no-track");
627 break;
628 case BRANCH_TRACK_ALWAYS:
629 case BRANCH_TRACK_EXPLICIT:
630 strvec_push(&child.args, "--track=direct");
631 break;
632 case BRANCH_TRACK_OVERRIDE:
633 BUG("BRANCH_TRACK_OVERRIDE cannot be used when creating a branch.");
634 break;
635 case BRANCH_TRACK_INHERIT:
636 strvec_push(&child.args, "--track=inherit");
637 break;
638 case BRANCH_TRACK_UNSPECIFIED:
1f888282 639 /* Default for "git checkout". Do not pass --track. */
75388bf5 640 case BRANCH_TRACK_REMOTE:
1f888282 641 /* Default for "git branch". Do not pass --track. */
75388bf5
GC
642 break;
643 }
961b130d
GC
644
645 strvec_pushl(&child.args, name, start_oid, tracking_name, NULL);
646
647 if ((ret = start_command(&child)))
648 return ret;
649 ret = finish_command(&child);
650 strbuf_read(&child_err, child.err, 0);
651 strbuf_add_lines(&out_buf, out_prefix, child_err.buf, child_err.len);
652
653 if (ret)
654 fprintf(stderr, "%s", out_buf.buf);
655 else
656 printf("%s", out_buf.buf);
657
658 strbuf_release(&child_err);
659 strbuf_release(&out_buf);
660 return ret;
661}
662
663void create_branches_recursively(struct repository *r, const char *name,
664 const char *start_commitish,
665 const char *tracking_name, int force,
666 int reflog, int quiet, enum branch_track track,
667 int dry_run)
668{
669 int i = 0;
670 char *branch_point = NULL;
671 struct object_id super_oid;
672 struct submodule_entry_list submodule_entry_list;
673
674 /* Perform dwim on start_commitish to get super_oid and branch_point. */
675 dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
676 &branch_point, &super_oid);
677
678 /*
679 * If we were not given an explicit name to track, then assume we are at
680 * the top level and, just like the non-recursive case, the tracking
681 * name is the branch point.
682 */
683 if (!tracking_name)
684 tracking_name = branch_point;
685
686 submodules_of_tree(r, &super_oid, &submodule_entry_list);
687 /*
688 * Before creating any branches, first check that the branch can
689 * be created in every submodule.
690 */
691 for (i = 0; i < submodule_entry_list.entry_nr; i++) {
e6bf70d1 692 if (!submodule_entry_list.entries[i].repo) {
cfbda6ba
GC
693 int code = die_message(
694 _("submodule '%s': unable to find submodule"),
695 submodule_entry_list.entries[i].submodule->name);
961b130d
GC
696 if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
697 advise(_("You may try updating the submodules using 'git checkout %s && git submodule update --init'"),
698 start_commitish);
cfbda6ba 699 exit(code);
961b130d
GC
700 }
701
702 if (submodule_create_branch(
703 submodule_entry_list.entries[i].repo,
704 submodule_entry_list.entries[i].submodule, name,
705 oid_to_hex(&submodule_entry_list.entries[i]
706 .name_entry->oid),
707 tracking_name, force, reflog, quiet, track, 1))
708 die(_("submodule '%s': cannot create branch '%s'"),
709 submodule_entry_list.entries[i].submodule->name,
710 name);
711 }
712
713 create_branch(the_repository, name, start_commitish, force, 0, reflog, quiet,
714 BRANCH_TRACK_NEVER, dry_run);
715 if (dry_run)
716 return;
717 /*
718 * NEEDSWORK If tracking was set up in the superproject but not the
719 * submodule, users might expect "git branch --recurse-submodules" to
720 * fail or give a warning, but this is not yet implemented because it is
721 * tedious to determine whether or not tracking was set up in the
722 * superproject.
723 */
75388bf5
GC
724 if (track)
725 setup_tracking(name, tracking_name, track, quiet);
961b130d
GC
726
727 for (i = 0; i < submodule_entry_list.entry_nr; i++) {
728 if (submodule_create_branch(
729 submodule_entry_list.entries[i].repo,
730 submodule_entry_list.entries[i].submodule, name,
731 oid_to_hex(&submodule_entry_list.entries[i]
732 .name_entry->oid),
733 tracking_name, force, reflog, quiet, track, 0))
734 die(_("submodule '%s': cannot create branch '%s'"),
735 submodule_entry_list.entries[i].submodule->name,
736 name);
737 repo_clear(submodule_entry_list.entries[i].repo);
738 }
739}
740
b6433555 741void remove_merge_branch_state(struct repository *r)
c369e7b8 742{
4edce172
NTND
743 unlink(git_path_merge_head(r));
744 unlink(git_path_merge_rr(r));
745 unlink(git_path_merge_msg(r));
746 unlink(git_path_merge_mode(r));
5291828d 747 unlink(git_path_auto_merge(r));
a03b5553 748 save_autostash(git_path_merge_autostash(r));
b6433555
NTND
749}
750
f496b064 751void remove_branch_state(struct repository *r, int verbose)
b6433555 752{
f496b064 753 sequencer_post_commit_cleanup(r, verbose);
4edce172 754 unlink(git_path_squash_msg(r));
b6433555 755 remove_merge_branch_state(r);
c369e7b8 756}
ed89f84b 757
8d9fdd70 758void die_if_checked_out(const char *branch, int ignore_current_worktree)
41af6565 759{
c8dd491f 760 struct worktree **worktrees = get_worktrees();
d3b9ac07 761 const struct worktree *wt;
41af6565 762
c8dd491f
AK
763 wt = find_shared_symref(worktrees, "HEAD", branch);
764 if (wt && (!ignore_current_worktree || !wt->is_current)) {
765 skip_prefix(branch, "refs/heads/", &branch);
766 die(_("'%s' is already checked out at '%s'"), branch, wt->path);
767 }
768
769 free_worktrees(worktrees);
ed89f84b 770}
70999e9c 771
39ee4c6c
KM
772int replace_each_worktree_head_symref(const char *oldref, const char *newref,
773 const char *logmsg)
70999e9c
KY
774{
775 int ret = 0;
03f2465b 776 struct worktree **worktrees = get_worktrees();
70999e9c
KY
777 int i;
778
779 for (i = 0; worktrees[i]; i++) {
d026a256
NTND
780 struct ref_store *refs;
781
70999e9c
KY
782 if (worktrees[i]->is_detached)
783 continue;
31824d18
NTND
784 if (!worktrees[i]->head_ref)
785 continue;
786 if (strcmp(oldref, worktrees[i]->head_ref))
70999e9c
KY
787 continue;
788
d026a256
NTND
789 refs = get_worktree_ref_store(worktrees[i]);
790 if (refs_create_symref(refs, "HEAD", newref, logmsg))
791 ret = error(_("HEAD of working tree %s is not updated"),
792 worktrees[i]->path);
70999e9c
KY
793 }
794
795 free_worktrees(worktrees);
796 return ret;
797}