blob: ba3914adf5b7bfdccd5b76774e1287bf52d1e749 [file] [log] [blame]
Brian Gesiak303d1d02014-02-28 15:43:33 +09001#include "git-compat-util.h"
Elijah Newren6c6ddf92023-04-11 03:00:39 +00002#include "advice.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07003#include "config.h"
Daniel Barkalowe496c002008-02-07 11:40:08 -05004#include "branch.h"
Elijah Newren32a8f512023-03-21 06:26:03 +00005#include "environment.h"
Elijah Newrenf394e092023-03-21 06:25:54 +00006#include "gettext.h"
Elijah Newren41771fa2023-02-24 00:09:27 +00007#include "hex.h"
Elijah Newrendabab1d2023-04-11 00:41:49 -07008#include "object-name.h"
Daniel Barkalowe496c002008-02-07 11:40:08 -05009#include "refs.h"
Brandon Williamsec0cb492018-05-16 15:57:48 -070010#include "refspec.h"
Daniel Barkalowe496c002008-02-07 11:40:08 -050011#include "remote.h"
Elijah Newrend1cbe1e2023-04-22 20:17:20 +000012#include "repository.h"
Phillip Woodb07d9bf2019-04-16 11:18:41 +010013#include "sequencer.h"
Daniel Barkalowe496c002008-02-07 11:40:08 -050014#include "commit.h"
Michael Rappazzoac6c5612015-10-02 07:55:31 -040015#include "worktree.h"
Glen Choo961b1302022-01-28 16:04:45 -080016#include "submodule-config.h"
17#include "run-command.h"
Derrick Stolee31ad6b62022-06-14 19:27:29 +000018#include "strmap.h"
Daniel Barkalowe496c002008-02-07 11:40:08 -050019
20struct tracking {
Brandon Williams0ad4a5f2018-05-16 15:57:49 -070021 struct refspec_item spec;
Josh Steadmond3115662021-12-20 19:30:23 -080022 struct string_list *srcs;
Daniel Barkalowe496c002008-02-07 11:40:08 -050023 const char *remote;
24 int matches;
25};
26
Tao Klerkse4921d82022-04-01 06:05:13 +000027struct find_tracked_branch_cb {
28 struct tracking *tracking;
29 struct string_list ambiguous_remotes;
30};
31
Daniel Barkalowe496c002008-02-07 11:40:08 -050032static int find_tracked_branch(struct remote *remote, void *priv)
33{
Tao Klerkse4921d82022-04-01 06:05:13 +000034 struct find_tracked_branch_cb *ftb = priv;
35 struct tracking *tracking = ftb->tracking;
Daniel Barkalowe496c002008-02-07 11:40:08 -050036
37 if (!remote_find_tracking(remote, &tracking->spec)) {
Tao Klerkse4921d82022-04-01 06:05:13 +000038 switch (++tracking->matches) {
39 case 1:
Josh Steadmond3115662021-12-20 19:30:23 -080040 string_list_append(tracking->srcs, tracking->spec.src);
Daniel Barkalowe496c002008-02-07 11:40:08 -050041 tracking->remote = remote->name;
Tao Klerkse4921d82022-04-01 06:05:13 +000042 break;
43 case 2:
44 /* there are at least two remotes; backfill the first one */
45 string_list_append(&ftb->ambiguous_remotes, tracking->remote);
46 /* fall through */
47 default:
48 string_list_append(&ftb->ambiguous_remotes, remote->name);
Daniel Barkalowe496c002008-02-07 11:40:08 -050049 free(tracking->spec.src);
Josh Steadmond3115662021-12-20 19:30:23 -080050 string_list_clear(tracking->srcs, 0);
Tao Klerkse4921d82022-04-01 06:05:13 +000051 break;
Daniel Barkalowe496c002008-02-07 11:40:08 -050052 }
Tao Klerksbdaf1df2022-04-29 09:56:44 +000053 /* remote_find_tracking() searches by src if present */
Daniel Barkalowe496c002008-02-07 11:40:08 -050054 tracking->spec.src = NULL;
55 }
Daniel Barkalowe496c002008-02-07 11:40:08 -050056 return 0;
57}
58
Junio C Hamanoa9f2c132009-03-03 22:29:55 -080059static int should_setup_rebase(const char *origin)
Dustin Sallingsc998ae92008-05-10 15:36:29 -070060{
61 switch (autorebase) {
62 case AUTOREBASE_NEVER:
63 return 0;
64 case AUTOREBASE_LOCAL:
Junio C Hamanoa9f2c132009-03-03 22:29:55 -080065 return origin == NULL;
Dustin Sallingsc998ae92008-05-10 15:36:29 -070066 case AUTOREBASE_REMOTE:
Junio C Hamanoa9f2c132009-03-03 22:29:55 -080067 return origin != NULL;
Dustin Sallingsc998ae92008-05-10 15:36:29 -070068 case AUTOREBASE_ALWAYS:
69 return 1;
70 }
71 return 0;
72}
73
Josh Steadmona3f40ec2021-12-20 19:30:22 -080074/**
75 * Install upstream tracking configuration for a branch; specifically, add
76 * `branch.<name>.remote` and `branch.<name>.merge` entries.
77 *
78 * `flag` contains integer flags for options; currently only
79 * BRANCH_CONFIG_VERBOSE is checked.
80 *
81 * `local` is the name of the branch whose configuration we're installing.
82 *
83 * `origin` is the name of the remote owning the upstream branches. NULL means
84 * the upstream branches are local to this repo.
85 *
86 * `remotes` is a list of refs that are upstream of local
87 */
88static int install_branch_config_multiple_remotes(int flag, const char *local,
89 const char *origin, struct string_list *remotes)
Junio C Hamanoa9f2c132009-03-03 22:29:55 -080090{
Jeff Kingcf4fff52014-06-18 15:44:19 -040091 const char *shortname = NULL;
Junio C Hamanoa9f2c132009-03-03 22:29:55 -080092 struct strbuf key = STRBUF_INIT;
Josh Steadmona3f40ec2021-12-20 19:30:22 -080093 struct string_list_item *item;
Junio C Hamanoa9f2c132009-03-03 22:29:55 -080094 int rebasing = should_setup_rebase(origin);
95
Josh Steadmona3f40ec2021-12-20 19:30:22 -080096 if (!remotes->nr)
97 BUG("must provide at least one remote for branch config");
98 if (rebasing && remotes->nr > 1)
99 die(_("cannot inherit upstream tracking configuration of "
100 "multiple refs when rebasing is requested"));
101
102 /*
103 * If the new branch is trying to track itself, something has gone
104 * wrong. Warn the user and don't proceed any further.
105 */
106 if (!origin)
107 for_each_string_list_item(item, remotes)
108 if (skip_prefix(item->string, "refs/heads/", &shortname)
109 && !strcmp(local, shortname)) {
Junio C Hamano0669bdf2022-01-10 11:52:54 -0800110 warning(_("not setting branch '%s' as its own upstream"),
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800111 local);
112 return 0;
113 }
Matthieu Moy85e22332010-01-18 22:44:12 +0200114
Junio C Hamanoa9f2c132009-03-03 22:29:55 -0800115 strbuf_addf(&key, "branch.%s.remote", local);
Patrick Steinhardt30598ad2016-02-22 12:23:35 +0100116 if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100117 goto out_err;
Junio C Hamanoa9f2c132009-03-03 22:29:55 -0800118
119 strbuf_reset(&key);
120 strbuf_addf(&key, "branch.%s.merge", local);
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800121 /*
122 * We want to overwrite any existing config with all the branches in
123 * "remotes". Override any existing config, then write our branches. If
124 * more than one is provided, use CONFIG_REGEX_NONE to preserve what
125 * we've written so far.
126 */
127 if (git_config_set_gently(key.buf, NULL) < 0)
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100128 goto out_err;
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800129 for_each_string_list_item(item, remotes)
130 if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0)
131 goto out_err;
Junio C Hamanoa9f2c132009-03-03 22:29:55 -0800132
133 if (rebasing) {
134 strbuf_reset(&key);
135 strbuf_addf(&key, "branch.%s.rebase", local);
Patrick Steinhardt30598ad2016-02-22 12:23:35 +0100136 if (git_config_set_gently(key.buf, "true") < 0)
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100137 goto out_err;
Junio C Hamanoa9f2c132009-03-03 22:29:55 -0800138 }
Nguyễn Thái Ngọc Duyd53a35032012-06-07 19:05:10 +0700139 strbuf_release(&key);
Junio C Hamanoa9f2c132009-03-03 22:29:55 -0800140
Junio C Hamano72f60082009-03-10 01:20:42 -0700141 if (flag & BRANCH_CONFIG_VERBOSE) {
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800142 struct strbuf tmp_ref_name = STRBUF_INIT;
143 struct string_list friendly_ref_names = STRING_LIST_INIT_DUP;
144
145 for_each_string_list_item(item, remotes) {
146 shortname = item->string;
147 skip_prefix(shortname, "refs/heads/", &shortname);
148 if (origin) {
149 strbuf_addf(&tmp_ref_name, "%s/%s",
150 origin, shortname);
151 string_list_append_nodup(
152 &friendly_ref_names,
153 strbuf_detach(&tmp_ref_name, NULL));
154 } else {
155 string_list_append(
156 &friendly_ref_names, shortname);
157 }
Adam9fe0cf32014-03-10 01:32:01 -0400158 }
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800159
160 if (remotes->nr == 1) {
161 /*
162 * Rebasing is only allowed in the case of a single
163 * upstream branch.
164 */
165 printf_ln(rebasing ?
166 _("branch '%s' set up to track '%s' by rebasing.") :
167 _("branch '%s' set up to track '%s'."),
168 local, friendly_ref_names.items[0].string);
169 } else {
170 printf_ln(_("branch '%s' set up to track:"), local);
171 for_each_string_list_item(item, &friendly_ref_names)
172 printf_ln(" %s", item->string);
173 }
174
175 string_list_clear(&friendly_ref_names, 0);
Junio C Hamano72f60082009-03-10 01:20:42 -0700176 }
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100177
178 return 0;
179
180out_err:
181 strbuf_release(&key);
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800182 error(_("unable to write upstream branch configuration"));
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100183
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800184 advise(_("\nAfter fixing the error cause you may try to fix up\n"
185 "the remote tracking information by invoking:"));
186 if (remotes->nr == 1)
187 advise(" git branch --set-upstream-to=%s%s%s",
188 origin ? origin : "",
189 origin ? "/" : "",
190 remotes->items[0].string);
191 else {
192 advise(" git config --add branch.\"%s\".remote %s",
193 local, origin ? origin : ".");
194 for_each_string_list_item(item, remotes)
195 advise(" git config --add branch.\"%s\".merge %s",
196 local, item->string);
197 }
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100198
199 return -1;
Junio C Hamanoa9f2c132009-03-03 22:29:55 -0800200}
201
Josh Steadmona3f40ec2021-12-20 19:30:22 -0800202int install_branch_config(int flag, const char *local, const char *origin,
203 const char *remote)
204{
205 int ret;
206 struct string_list remotes = STRING_LIST_INIT_DUP;
207
208 string_list_append(&remotes, remote);
209 ret = install_branch_config_multiple_remotes(flag, local, origin, &remotes);
210 string_list_clear(&remotes, 0);
211 return ret;
212}
213
Josh Steadmond3115662021-12-20 19:30:23 -0800214static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
215{
216 const char *bare_ref;
217 struct branch *branch;
218 int i;
219
220 bare_ref = orig_ref;
221 skip_prefix(orig_ref, "refs/heads/", &bare_ref);
222
223 branch = branch_get(bare_ref);
224 if (!branch->remote_name) {
225 warning(_("asked to inherit tracking from '%s', but no remote is set"),
226 bare_ref);
227 return -1;
228 }
229
230 if (branch->merge_nr < 1 || !branch->merge_name || !branch->merge_name[0]) {
231 warning(_("asked to inherit tracking from '%s', but no merge configuration is set"),
232 bare_ref);
233 return -1;
234 }
235
236 tracking->remote = xstrdup(branch->remote_name);
237 for (i = 0; i < branch->merge_nr; i++)
238 string_list_append(tracking->srcs, branch->merge_name[i]);
239 return 0;
240}
241
Daniel Barkalowe496c002008-02-07 11:40:08 -0500242/*
Glen Chooe89f1512022-01-28 16:04:41 -0800243 * Used internally to set the branch.<new_ref>.{remote,merge} config
244 * settings so that branch 'new_ref' tracks 'orig_ref'. Unlike
245 * dwim_and_setup_tracking(), this does not do DWIM, i.e. "origin/main"
246 * will not be expanded to "refs/remotes/origin/main", so it is not safe
247 * for 'orig_ref' to be raw user input.
Daniel Barkalowe496c002008-02-07 11:40:08 -0500248 */
Patrick Steinhardt27852b22016-02-22 12:23:23 +0100249static void setup_tracking(const char *new_ref, const char *orig_ref,
250 enum branch_track track, int quiet)
Daniel Barkalowe496c002008-02-07 11:40:08 -0500251{
Daniel Barkalowe496c002008-02-07 11:40:08 -0500252 struct tracking tracking;
Josh Steadmond3115662021-12-20 19:30:23 -0800253 struct string_list tracking_srcs = STRING_LIST_INIT_DUP;
Jeff Kingf9a482e2012-03-26 19:51:01 -0400254 int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
Tao Klerkse4921d82022-04-01 06:05:13 +0000255 struct find_tracked_branch_cb ftb_cb = {
256 .tracking = &tracking,
257 .ambiguous_remotes = STRING_LIST_INIT_DUP,
258 };
Daniel Barkalowe496c002008-02-07 11:40:08 -0500259
Glen Choo75388bf2022-03-29 20:01:16 +0000260 if (!track)
261 BUG("asked to set up tracking, but tracking is disallowed");
262
Daniel Barkalowe496c002008-02-07 11:40:08 -0500263 memset(&tracking, 0, sizeof(tracking));
264 tracking.spec.dst = (char *)orig_ref;
Josh Steadmond3115662021-12-20 19:30:23 -0800265 tracking.srcs = &tracking_srcs;
266 if (track != BRANCH_TRACK_INHERIT)
Tao Klerkse4921d82022-04-01 06:05:13 +0000267 for_each_remote(find_tracked_branch, &ftb_cb);
Josh Steadmond3115662021-12-20 19:30:23 -0800268 else if (inherit_tracking(&tracking, orig_ref))
Glen Choo679e3692022-01-28 16:04:46 -0800269 goto cleanup;
Daniel Barkalowe496c002008-02-07 11:40:08 -0500270
Jay Soffian9ed36cf2008-02-19 11:24:37 -0500271 if (!tracking.matches)
272 switch (track) {
Tao Klerksbdaf1df2022-04-29 09:56:44 +0000273 /* If ref is not remote, still use local */
Jay Soffian9ed36cf2008-02-19 11:24:37 -0500274 case BRANCH_TRACK_ALWAYS:
275 case BRANCH_TRACK_EXPLICIT:
Ilari Liusvaara4fc50062010-01-18 22:44:11 +0200276 case BRANCH_TRACK_OVERRIDE:
Tao Klerksbdaf1df2022-04-29 09:56:44 +0000277 /* Remote matches not evaluated */
Josh Steadmond3115662021-12-20 19:30:23 -0800278 case BRANCH_TRACK_INHERIT:
Jay Soffian9ed36cf2008-02-19 11:24:37 -0500279 break;
Tao Klerksbdaf1df2022-04-29 09:56:44 +0000280 /* Otherwise, if no remote don't track */
Jay Soffian9ed36cf2008-02-19 11:24:37 -0500281 default:
Glen Choo679e3692022-01-28 16:04:46 -0800282 goto cleanup;
Jay Soffian9ed36cf2008-02-19 11:24:37 -0500283 }
284
Tao Klerksbdaf1df2022-04-29 09:56:44 +0000285 /*
286 * This check does not apply to BRANCH_TRACK_INHERIT;
287 * that supports multiple entries in tracking_srcs but
288 * leaves tracking.matches at 0.
289 */
Tao Klerkse4921d82022-04-01 06:05:13 +0000290 if (tracking.matches > 1) {
291 int status = die_message(_("not tracking: ambiguous information for ref '%s'"),
292 orig_ref);
293 if (advice_enabled(ADVICE_AMBIGUOUS_FETCH_REFSPEC)) {
294 struct strbuf remotes_advice = STRBUF_INIT;
295 struct string_list_item *item;
296
297 for_each_string_list_item(item, &ftb_cb.ambiguous_remotes)
298 /*
299 * TRANSLATORS: This is a line listing a remote with duplicate
300 * refspecs in the advice message below. For RTL languages you'll
301 * probably want to swap the "%s" and leading " " space around.
302 */
303 strbuf_addf(&remotes_advice, _(" %s\n"), item->string);
304
305 /*
306 * TRANSLATORS: The second argument is a \n-delimited list of
307 * duplicate refspecs, composed above.
308 */
309 advise(_("There are multiple remotes whose fetch refspecs map to the remote\n"
310 "tracking ref '%s':\n"
311 "%s"
312 "\n"
313 "This is typically a configuration error.\n"
314 "\n"
315 "To support setting up tracking branches, ensure that\n"
316 "different remotes' fetch refspecs map into different\n"
317 "tracking namespaces."), orig_ref,
318 remotes_advice.buf);
319 strbuf_release(&remotes_advice);
320 }
321 exit(status);
322 }
Daniel Barkalowe496c002008-02-07 11:40:08 -0500323
Tao Klerksbdaf1df2022-04-29 09:56:44 +0000324 if (track == BRANCH_TRACK_SIMPLE) {
325 /*
326 * Only track if remote branch name matches.
327 * Reaching into items[0].string is safe because
328 * we know there is at least one and not more than
329 * one entry (because only BRANCH_TRACK_INHERIT can
330 * produce more than one entry).
331 */
332 const char *tracked_branch;
333 if (!skip_prefix(tracking.srcs->items[0].string,
334 "refs/heads/", &tracked_branch) ||
335 strcmp(tracked_branch, new_ref))
336 return;
337 }
338
Josh Steadmond3115662021-12-20 19:30:23 -0800339 if (tracking.srcs->nr < 1)
340 string_list_append(tracking.srcs, orig_ref);
341 if (install_branch_config_multiple_remotes(config_flags, new_ref,
342 tracking.remote, tracking.srcs) < 0)
Glen Choo5391e942022-03-29 20:01:19 +0000343 exit(1);
Daniel Barkalowe496c002008-02-07 11:40:08 -0500344
Glen Choo679e3692022-01-28 16:04:46 -0800345cleanup:
346 string_list_clear(&tracking_srcs, 0);
Tao Klerkse4921d82022-04-01 06:05:13 +0000347 string_list_clear(&ftb_cb.ambiguous_remotes, 0);
Daniel Barkalowe496c002008-02-07 11:40:08 -0500348}
349
Junio C Hamano6f9a3322011-09-21 20:19:38 -0700350int read_branch_desc(struct strbuf *buf, const char *branch_name)
351{
Tanay Abhra540b0f42014-08-07 23:26:42 +0530352 char *v = NULL;
Junio C Hamano6f9a3322011-09-21 20:19:38 -0700353 struct strbuf name = STRBUF_INIT;
354 strbuf_addf(&name, "branch.%s.description", branch_name);
Tanay Abhra540b0f42014-08-07 23:26:42 +0530355 if (git_config_get_string(name.buf, &v)) {
356 strbuf_release(&name);
357 return -1;
358 }
359 strbuf_addstr(buf, v);
360 free(v);
Junio C Hamano6f9a3322011-09-21 20:19:38 -0700361 strbuf_release(&name);
362 return 0;
363}
364
Junio C Hamanobc1c9c02017-10-13 13:45:40 +0900365/*
366 * Check if 'name' can be a valid name for a branch; die otherwise.
367 * Return 1 if the named branch already exists; return 0 otherwise.
368 * Fill ref with the full refname for the branch.
369 */
370int validate_branchname(const char *name, struct strbuf *ref)
Conrad Irwin55c4a672011-08-20 14:49:48 -0700371{
Conrad Irwin55c4a672011-08-20 14:49:48 -0700372 if (strbuf_check_branch_ref(ref, name))
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800373 die(_("'%s' is not a valid branch name"), name);
Conrad Irwin55c4a672011-08-20 14:49:48 -0700374
Junio C Hamanobc1c9c02017-10-13 13:45:40 +0900375 return ref_exists(ref->buf);
376}
Conrad Irwin55c4a672011-08-20 14:49:48 -0700377
Derrick Stolee31ad6b62022-06-14 19:27:29 +0000378static int initialized_checked_out_branches;
379static struct strmap current_checked_out_branches = STRMAP_INIT;
380
381static void prepare_checked_out_branches(void)
382{
383 int i = 0;
384 struct worktree **worktrees;
385
386 if (initialized_checked_out_branches)
387 return;
388 initialized_checked_out_branches = 1;
389
390 worktrees = get_worktrees();
391
392 while (worktrees[i]) {
Derrick Stolee4b6e18f2022-06-14 19:27:33 +0000393 char *old;
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000394 struct wt_status_state state = { 0 };
Derrick Stolee31ad6b62022-06-14 19:27:29 +0000395 struct worktree *wt = worktrees[i++];
Derrick Stoleeaa7f2fd2022-07-19 18:33:35 +0000396 struct string_list update_refs = STRING_LIST_INIT_DUP;
Derrick Stolee31ad6b62022-06-14 19:27:29 +0000397
398 if (wt->is_bare)
399 continue;
400
Derrick Stolee4b6e18f2022-06-14 19:27:33 +0000401 if (wt->head_ref) {
402 old = strmap_put(&current_checked_out_branches,
403 wt->head_ref,
404 xstrdup(wt->path));
405 free(old);
406 }
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000407
408 if (wt_status_check_rebase(wt, &state) &&
409 (state.rebase_in_progress || state.rebase_interactive_in_progress) &&
410 state.branch) {
411 struct strbuf ref = STRBUF_INIT;
412 strbuf_addf(&ref, "refs/heads/%s", state.branch);
Derrick Stolee4b6e18f2022-06-14 19:27:33 +0000413 old = strmap_put(&current_checked_out_branches,
414 ref.buf,
415 xstrdup(wt->path));
416 free(old);
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000417 strbuf_release(&ref);
418 }
419 wt_status_state_free_buffers(&state);
420
421 if (wt_status_check_bisect(wt, &state) &&
422 state.branch) {
423 struct strbuf ref = STRBUF_INIT;
424 strbuf_addf(&ref, "refs/heads/%s", state.branch);
Derrick Stolee4b6e18f2022-06-14 19:27:33 +0000425 old = strmap_put(&current_checked_out_branches,
426 ref.buf,
427 xstrdup(wt->path));
428 free(old);
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000429 strbuf_release(&ref);
430 }
431 wt_status_state_free_buffers(&state);
Derrick Stoleeaa7f2fd2022-07-19 18:33:35 +0000432
433 if (!sequencer_get_update_refs_state(get_worktree_git_dir(wt),
434 &update_refs)) {
435 struct string_list_item *item;
436 for_each_string_list_item(item, &update_refs) {
437 old = strmap_put(&current_checked_out_branches,
438 item->string,
439 xstrdup(wt->path));
440 free(old);
441 }
442 string_list_clear(&update_refs, 1);
443 }
Derrick Stolee31ad6b62022-06-14 19:27:29 +0000444 }
445
446 free_worktrees(worktrees);
447}
448
449const char *branch_checked_out(const char *refname)
450{
451 prepare_checked_out_branches();
452 return strmap_get(&current_checked_out_branches, refname);
453}
454
Junio C Hamanobc1c9c02017-10-13 13:45:40 +0900455/*
456 * Check if a branch 'name' can be created as a new branch; die otherwise.
457 * 'force' can be used when it is OK for the named branch already exists.
458 * Return 1 if the named branch already exists; return 0 otherwise.
459 * Fill ref with the full refname for the branch.
460 */
461int validate_new_branchname(const char *name, struct strbuf *ref, int force)
462{
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000463 const char *path;
Junio C Hamanobc1c9c02017-10-13 13:45:40 +0900464 if (!validate_branchname(name, ref))
Conrad Irwin55c4a672011-08-20 14:49:48 -0700465 return 0;
Conrad Irwin55c4a672011-08-20 14:49:48 -0700466
Junio C Hamano8280c4c2017-10-13 12:57:02 +0900467 if (!force)
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800468 die(_("a branch named '%s' already exists"),
Junio C Hamano8280c4c2017-10-13 12:57:02 +0900469 ref->buf + strlen("refs/heads/"));
Conrad Irwin55c4a672011-08-20 14:49:48 -0700470
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000471 if ((path = branch_checked_out(ref->buf)))
Bagas Sanjaya68d924e2022-01-11 19:36:27 +0700472 die(_("cannot force update the branch '%s' "
Anders Kaseorg593a2a52021-12-01 14:15:47 -0800473 "checked out at '%s'"),
Derrick Stoleed2ba2712022-06-14 19:27:30 +0000474 ref->buf + strlen("refs/heads/"), path);
Junio C Hamano8280c4c2017-10-13 12:57:02 +0900475
Conrad Irwin55c4a672011-08-20 14:49:48 -0700476 return 1;
477}
478
Johan Herland41c21f22013-04-21 23:52:05 +0200479static int check_tracking_branch(struct remote *remote, void *cb_data)
480{
481 char *tracking_branch = cb_data;
Brandon Williams0ad4a5f2018-05-16 15:57:49 -0700482 struct refspec_item query;
483 memset(&query, 0, sizeof(struct refspec_item));
Johan Herland41c21f22013-04-21 23:52:05 +0200484 query.dst = tracking_branch;
Per Cederqvist1d7358c2013-09-08 22:58:15 +0200485 return !remote_find_tracking(remote, &query);
Johan Herland41c21f22013-04-21 23:52:05 +0200486}
487
488static int validate_remote_tracking_branch(char *ref)
489{
490 return !for_each_remote(check_tracking_branch, ref);
491}
492
Jeff Kinge2b6aa52013-04-02 15:03:55 -0400493static const char upstream_not_branch[] =
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800494N_("cannot set up tracking information; starting point '%s' is not a branch");
Jeff Kinga5e91c72013-04-02 15:04:27 -0400495static const char upstream_missing[] =
Jeff Kingcaa20362013-04-02 15:05:12 -0400496N_("the requested upstream branch '%s' does not exist");
497static const char upstream_advice[] =
498N_("\n"
499"If you are planning on basing your work on an upstream\n"
500"branch that already exists at the remote, you may need to\n"
501"run \"git fetch\" to retrieve it.\n"
502"\n"
503"If you are planning to push out a new local branch that\n"
504"will track its remote counterpart, you may want to use\n"
505"\"git push -u\" to set the upstream config as you push.");
Jeff Kinge2b6aa52013-04-02 15:03:55 -0400506
Glen Chooe89f1512022-01-28 16:04:41 -0800507/**
508 * DWIMs a user-provided ref to determine the starting point for a
509 * branch and validates it, where:
510 *
511 * - r is the repository to validate the branch for
512 *
513 * - start_name is the ref that we would like to test. This is
514 * expanded with DWIM and assigned to out_real_ref.
515 *
516 * - track is the tracking mode of the new branch. If tracking is
517 * explicitly requested, start_name must be a branch (because
518 * otherwise start_name cannot be tracked)
519 *
520 * - out_oid is an out parameter containing the object_id of start_name
521 *
522 * - out_real_ref is an out parameter containing the full, 'real' form
523 * of start_name e.g. refs/heads/main instead of main
524 *
525 */
526static void dwim_branch_start(struct repository *r, const char *start_name,
527 enum branch_track track, char **out_real_ref,
528 struct object_id *out_oid)
Daniel Barkalowe496c002008-02-07 11:40:08 -0500529{
Daniel Barkalowe496c002008-02-07 11:40:08 -0500530 struct commit *commit;
brian m. carlson48713bf2017-05-01 02:29:00 +0000531 struct object_id oid;
Jeff King3818b252017-03-28 15:46:36 -0400532 char *real_ref;
Ilari Liusvaara4fc50062010-01-18 22:44:11 +0200533 int explicit_tracking = 0;
534
535 if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
536 explicit_tracking = 1;
Daniel Barkalowe496c002008-02-07 11:40:08 -0500537
Daniel Barkalowe496c002008-02-07 11:40:08 -0500538 real_ref = NULL;
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +0200539 if (repo_get_oid_mb(r, start_name, &oid)) {
Jeff Kingcaa20362013-04-02 15:05:12 -0400540 if (explicit_tracking) {
Glen Choo66966012022-03-31 15:41:18 -0700541 int code = die_message(_(upstream_missing), start_name);
542 advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
543 _(upstream_advice));
544 exit(code);
Jeff Kingcaa20362013-04-02 15:05:12 -0400545 }
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800546 die(_("not a valid object name: '%s'"), start_name);
Jeff Kinga5e91c72013-04-02 15:04:27 -0400547 }
Daniel Barkalowe496c002008-02-07 11:40:08 -0500548
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +0200549 switch (repo_dwim_ref(r, start_name, strlen(start_name), &oid,
550 &real_ref, 0)) {
Daniel Barkalowe496c002008-02-07 11:40:08 -0500551 case 0:
552 /* Not branching from any existing branch */
Ilari Liusvaara4fc50062010-01-18 22:44:11 +0200553 if (explicit_tracking)
Jeff King1a15d002013-04-02 15:04:51 -0400554 die(_(upstream_not_branch), start_name);
Daniel Barkalowe496c002008-02-07 11:40:08 -0500555 break;
556 case 1:
Johan Herland21b5b1e2011-02-17 00:12:20 +0100557 /* Unique completion -- good, only if it is a real branch */
Christian Couder59556542013-11-30 21:55:40 +0100558 if (!starts_with(real_ref, "refs/heads/") &&
Johan Herland41c21f22013-04-21 23:52:05 +0200559 validate_remote_tracking_branch(real_ref)) {
Johan Herland21b5b1e2011-02-17 00:12:20 +0100560 if (explicit_tracking)
Jeff King1a15d002013-04-02 15:04:51 -0400561 die(_(upstream_not_branch), start_name);
Johan Herland21b5b1e2011-02-17 00:12:20 +0100562 else
Andrzej Huntd8958042021-04-25 14:16:12 +0000563 FREE_AND_NULL(real_ref);
Johan Herland21b5b1e2011-02-17 00:12:20 +0100564 }
Daniel Barkalowe496c002008-02-07 11:40:08 -0500565 break;
566 default:
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800567 die(_("ambiguous object name: '%s'"), start_name);
Daniel Barkalowe496c002008-02-07 11:40:08 -0500568 break;
569 }
570
Junio C Hamanoafe8a902022-05-02 09:50:37 -0700571 if (!(commit = lookup_commit_reference(r, &oid)))
Anders Kaseorg7435e7e2021-12-01 14:15:42 -0800572 die(_("not a valid branch point: '%s'"), start_name);
Glen Chooe89f1512022-01-28 16:04:41 -0800573 if (out_real_ref) {
574 *out_real_ref = real_ref;
575 real_ref = NULL;
576 }
577 if (out_oid)
578 oidcpy(out_oid, &commit->object.oid);
579
580 FREE_AND_NULL(real_ref);
581}
582
583void create_branch(struct repository *r,
584 const char *name, const char *start_name,
585 int force, int clobber_head_ok, int reflog,
Glen Choo3f3e7602022-01-28 16:04:43 -0800586 int quiet, enum branch_track track, int dry_run)
Glen Chooe89f1512022-01-28 16:04:41 -0800587{
588 struct object_id oid;
589 char *real_ref;
590 struct strbuf ref = STRBUF_INIT;
591 int forcing = 0;
Glen Choobc0893c2022-01-28 16:04:42 -0800592 struct ref_transaction *transaction;
593 struct strbuf err = STRBUF_INIT;
594 char *msg;
Glen Chooe89f1512022-01-28 16:04:41 -0800595
Glen Choobc0893c2022-01-28 16:04:42 -0800596 if (track == BRANCH_TRACK_OVERRIDE)
597 BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
598 if (clobber_head_ok && !force)
599 BUG("'clobber_head_ok' can only be used with 'force'");
600
601 if (clobber_head_ok ?
602 validate_branchname(name, &ref) :
603 validate_new_branchname(name, &ref, force)) {
604 forcing = 1;
Glen Chooe89f1512022-01-28 16:04:41 -0800605 }
606
607 dwim_branch_start(r, start_name, track, &real_ref, &oid);
Glen Choo3f3e7602022-01-28 16:04:43 -0800608 if (dry_run)
609 goto cleanup;
Daniel Barkalowe496c002008-02-07 11:40:08 -0500610
Ronnie Sahlbergd43f9902014-04-16 16:21:53 -0700611 if (reflog)
Cornelius Weig341fb282017-01-27 11:09:47 +0100612 log_all_ref_updates = LOG_REFS_NORMAL;
Ronnie Sahlbergd43f9902014-04-16 16:21:53 -0700613
Glen Choobc0893c2022-01-28 16:04:42 -0800614 if (forcing)
615 msg = xstrfmt("branch: Reset to %s", start_name);
616 else
617 msg = xstrfmt("branch: Created from %s", start_name);
618 transaction = ref_transaction_begin(&err);
619 if (!transaction ||
620 ref_transaction_update(transaction, ref.buf,
621 &oid, forcing ? NULL : null_oid(),
622 0, msg, &err) ||
623 ref_transaction_commit(transaction, &err))
624 die("%s", err.buf);
625 ref_transaction_free(transaction);
626 strbuf_release(&err);
627 free(msg);
Ronnie Sahlbergd43f9902014-04-16 16:21:53 -0700628
Daniel Barkalowe496c002008-02-07 11:40:08 -0500629 if (real_ref && track)
Felipe Contreras82a06722013-08-30 16:56:46 -0500630 setup_tracking(ref.buf + 11, real_ref, track, quiet);
Daniel Barkalowe496c002008-02-07 11:40:08 -0500631
Glen Choo3f3e7602022-01-28 16:04:43 -0800632cleanup:
Junio C Hamano8415d5c2009-02-13 23:08:05 -0800633 strbuf_release(&ref);
Jay Soffian9ed36cf2008-02-19 11:24:37 -0500634 free(real_ref);
Daniel Barkalowe496c002008-02-07 11:40:08 -0500635}
Daniel Barkalowc369e7b2008-02-07 11:40:16 -0500636
Glen Chooe89f1512022-01-28 16:04:41 -0800637void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
638 const char *orig_ref, enum branch_track track,
639 int quiet)
640{
641 char *real_orig_ref;
642 dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
643 setup_tracking(new_ref, real_orig_ref, track, quiet);
644}
645
Glen Choo961b1302022-01-28 16:04:45 -0800646/**
647 * Creates a branch in a submodule by calling
648 * create_branches_recursively() in a child process. The child process
649 * is necessary because install_branch_config_multiple_remotes() (which
650 * is called by setup_tracking()) does not support writing configs to
651 * submodules.
652 */
653static int submodule_create_branch(struct repository *r,
654 const struct submodule *submodule,
655 const char *name, const char *start_oid,
656 const char *tracking_name, int force,
657 int reflog, int quiet,
658 enum branch_track track, int dry_run)
659{
660 int ret = 0;
661 struct child_process child = CHILD_PROCESS_INIT;
662 struct strbuf child_err = STRBUF_INIT;
663 struct strbuf out_buf = STRBUF_INIT;
664 char *out_prefix = xstrfmt("submodule '%s': ", submodule->name);
665 child.git_cmd = 1;
666 child.err = -1;
667 child.stdout_to_stderr = 1;
668
Ævar Arnfjörð Bjarmason29fda242022-06-02 11:09:50 +0200669 prepare_other_repo_env(&child.env, r->gitdir);
Glen Choo961b1302022-01-28 16:04:45 -0800670 /*
671 * submodule_create_branch() is indirectly invoked by "git
672 * branch", but we cannot invoke "git branch" in the child
673 * process. "git branch" accepts a branch name and start point,
674 * where the start point is assumed to provide both the OID
675 * (start_oid) and the branch to use for tracking
676 * (tracking_name). But when recursing through submodules,
677 * start_oid and tracking name need to be specified separately
678 * (see create_branches_recursively()).
679 */
680 strvec_pushl(&child.args, "submodule--helper", "create-branch", NULL);
681 if (dry_run)
682 strvec_push(&child.args, "--dry-run");
683 if (force)
684 strvec_push(&child.args, "--force");
685 if (quiet)
686 strvec_push(&child.args, "--quiet");
687 if (reflog)
688 strvec_push(&child.args, "--create-reflog");
Glen Choo75388bf2022-03-29 20:01:16 +0000689
690 switch (track) {
691 case BRANCH_TRACK_NEVER:
692 strvec_push(&child.args, "--no-track");
693 break;
694 case BRANCH_TRACK_ALWAYS:
695 case BRANCH_TRACK_EXPLICIT:
696 strvec_push(&child.args, "--track=direct");
697 break;
698 case BRANCH_TRACK_OVERRIDE:
699 BUG("BRANCH_TRACK_OVERRIDE cannot be used when creating a branch.");
700 break;
701 case BRANCH_TRACK_INHERIT:
702 strvec_push(&child.args, "--track=inherit");
703 break;
704 case BRANCH_TRACK_UNSPECIFIED:
Glen Choo1f888282022-03-31 15:41:17 -0700705 /* Default for "git checkout". Do not pass --track. */
Glen Choo75388bf2022-03-29 20:01:16 +0000706 case BRANCH_TRACK_REMOTE:
Glen Choo1f888282022-03-31 15:41:17 -0700707 /* Default for "git branch". Do not pass --track. */
Tao Klerksbdaf1df2022-04-29 09:56:44 +0000708 case BRANCH_TRACK_SIMPLE:
709 /* Config-driven only. Do not pass --track. */
Glen Choo75388bf2022-03-29 20:01:16 +0000710 break;
711 }
Glen Choo961b1302022-01-28 16:04:45 -0800712
713 strvec_pushl(&child.args, name, start_oid, tracking_name, NULL);
714
715 if ((ret = start_command(&child)))
716 return ret;
717 ret = finish_command(&child);
718 strbuf_read(&child_err, child.err, 0);
719 strbuf_add_lines(&out_buf, out_prefix, child_err.buf, child_err.len);
720
721 if (ret)
722 fprintf(stderr, "%s", out_buf.buf);
723 else
724 printf("%s", out_buf.buf);
725
726 strbuf_release(&child_err);
727 strbuf_release(&out_buf);
728 return ret;
729}
730
731void create_branches_recursively(struct repository *r, const char *name,
732 const char *start_commitish,
733 const char *tracking_name, int force,
734 int reflog, int quiet, enum branch_track track,
735 int dry_run)
736{
737 int i = 0;
738 char *branch_point = NULL;
739 struct object_id super_oid;
740 struct submodule_entry_list submodule_entry_list;
741
742 /* Perform dwim on start_commitish to get super_oid and branch_point. */
743 dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
744 &branch_point, &super_oid);
745
746 /*
747 * If we were not given an explicit name to track, then assume we are at
748 * the top level and, just like the non-recursive case, the tracking
749 * name is the branch point.
750 */
751 if (!tracking_name)
752 tracking_name = branch_point;
753
754 submodules_of_tree(r, &super_oid, &submodule_entry_list);
755 /*
756 * Before creating any branches, first check that the branch can
757 * be created in every submodule.
758 */
759 for (i = 0; i < submodule_entry_list.entry_nr; i++) {
Junio C Hamanoe6bf70d2022-05-02 10:18:22 -0700760 if (!submodule_entry_list.entries[i].repo) {
Glen Choocfbda6b2022-03-29 20:01:17 +0000761 int code = die_message(
762 _("submodule '%s': unable to find submodule"),
763 submodule_entry_list.entries[i].submodule->name);
Glen Choo961b1302022-01-28 16:04:45 -0800764 if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
Philippe Blain97cf0c72023-01-16 17:41:48 +0000765 advise(_("You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'"),
Glen Choo961b1302022-01-28 16:04:45 -0800766 start_commitish);
Glen Choocfbda6b2022-03-29 20:01:17 +0000767 exit(code);
Glen Choo961b1302022-01-28 16:04:45 -0800768 }
769
770 if (submodule_create_branch(
771 submodule_entry_list.entries[i].repo,
772 submodule_entry_list.entries[i].submodule, name,
773 oid_to_hex(&submodule_entry_list.entries[i]
774 .name_entry->oid),
775 tracking_name, force, reflog, quiet, track, 1))
776 die(_("submodule '%s': cannot create branch '%s'"),
777 submodule_entry_list.entries[i].submodule->name,
778 name);
779 }
780
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +0200781 create_branch(r, name, start_commitish, force, 0, reflog, quiet,
Glen Choo961b1302022-01-28 16:04:45 -0800782 BRANCH_TRACK_NEVER, dry_run);
783 if (dry_run)
784 return;
785 /*
786 * NEEDSWORK If tracking was set up in the superproject but not the
787 * submodule, users might expect "git branch --recurse-submodules" to
788 * fail or give a warning, but this is not yet implemented because it is
789 * tedious to determine whether or not tracking was set up in the
790 * superproject.
791 */
Glen Choo75388bf2022-03-29 20:01:16 +0000792 if (track)
793 setup_tracking(name, tracking_name, track, quiet);
Glen Choo961b1302022-01-28 16:04:45 -0800794
795 for (i = 0; i < submodule_entry_list.entry_nr; i++) {
796 if (submodule_create_branch(
797 submodule_entry_list.entries[i].repo,
798 submodule_entry_list.entries[i].submodule, name,
799 oid_to_hex(&submodule_entry_list.entries[i]
800 .name_entry->oid),
801 tracking_name, force, reflog, quiet, track, 0))
802 die(_("submodule '%s': cannot create branch '%s'"),
803 submodule_entry_list.entries[i].submodule->name,
804 name);
805 repo_clear(submodule_entry_list.entries[i].repo);
806 }
807}
808
Nguyễn Thái Ngọc Duyb6433552019-05-09 17:10:27 +0700809void remove_merge_branch_state(struct repository *r)
Daniel Barkalowc369e7b2008-02-07 11:40:16 -0500810{
Nguyễn Thái Ngọc Duy4edce172018-11-10 06:49:00 +0100811 unlink(git_path_merge_head(r));
812 unlink(git_path_merge_rr(r));
813 unlink(git_path_merge_msg(r));
814 unlink(git_path_merge_mode(r));
Elijah Newren52918282021-03-20 00:03:52 +0000815 unlink(git_path_auto_merge(r));
Denton Liua03b5552020-04-07 10:28:07 -0400816 save_autostash(git_path_merge_autostash(r));
Nguyễn Thái Ngọc Duyb6433552019-05-09 17:10:27 +0700817}
818
Junio C Hamanof496b062019-07-09 15:25:44 -0700819void remove_branch_state(struct repository *r, int verbose)
Nguyễn Thái Ngọc Duyb6433552019-05-09 17:10:27 +0700820{
Junio C Hamanof496b062019-07-09 15:25:44 -0700821 sequencer_post_commit_cleanup(r, verbose);
Nguyễn Thái Ngọc Duy4edce172018-11-10 06:49:00 +0100822 unlink(git_path_squash_msg(r));
Nguyễn Thái Ngọc Duyb6433552019-05-09 17:10:27 +0700823 remove_merge_branch_state(r);
Daniel Barkalowc369e7b2008-02-07 11:40:16 -0500824}
Eric Sunshineed89f842015-07-17 19:00:04 -0400825
Nguyễn Thái Ngọc Duy8d9fdd72016-04-22 20:01:33 +0700826void die_if_checked_out(const char *branch, int ignore_current_worktree)
David Turner41af6562015-08-10 13:52:44 -0400827{
Anders Kaseorgc8dd4912021-12-01 14:15:43 -0800828 struct worktree **worktrees = get_worktrees();
David Turner41af6562015-08-10 13:52:44 -0400829
Rubén Justofaa4d592023-02-25 15:22:02 +0100830 for (int i = 0; worktrees[i]; i++) {
831 if (worktrees[i]->is_current && ignore_current_worktree)
832 continue;
833
834 if (is_shared_symref(worktrees[i], "HEAD", branch)) {
835 skip_prefix(branch, "refs/heads/", &branch);
836 die(_("'%s' is already checked out at '%s'"),
837 branch, worktrees[i]->path);
838 }
Anders Kaseorgc8dd4912021-12-01 14:15:43 -0800839 }
840
841 free_worktrees(worktrees);
Eric Sunshineed89f842015-07-17 19:00:04 -0400842}