Git 2.15-rc1
[git/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"
6#include "remote.h"
7#include "commit.h"
ac6c561b 8#include "worktree.h"
e496c003
DB
9
10struct tracking {
11 struct refspec spec;
12 char *src;
13 const char *remote;
14 int matches;
15};
16
17static int find_tracked_branch(struct remote *remote, void *priv)
18{
19 struct tracking *tracking = priv;
20
21 if (!remote_find_tracking(remote, &tracking->spec)) {
22 if (++tracking->matches == 1) {
23 tracking->src = tracking->spec.src;
24 tracking->remote = remote->name;
25 } else {
26 free(tracking->spec.src);
27 if (tracking->src) {
6a83d902 28 FREE_AND_NULL(tracking->src);
e496c003
DB
29 }
30 }
31 tracking->spec.src = NULL;
32 }
33
34 return 0;
35}
36
a9f2c136 37static int should_setup_rebase(const char *origin)
c998ae9b
DS
38{
39 switch (autorebase) {
40 case AUTOREBASE_NEVER:
41 return 0;
42 case AUTOREBASE_LOCAL:
a9f2c136 43 return origin == NULL;
c998ae9b 44 case AUTOREBASE_REMOTE:
a9f2c136 45 return origin != NULL;
c998ae9b
DS
46 case AUTOREBASE_ALWAYS:
47 return 1;
48 }
49 return 0;
50}
51
27852b2c
PS
52static const char tracking_advice[] =
53N_("\n"
54"After fixing the error cause you may try to fix up\n"
55"the remote tracking information by invoking\n"
56"\"git branch --set-upstream-to=%s%s%s\".");
57
58int install_branch_config(int flag, const char *local, const char *origin, const char *remote)
a9f2c136 59{
cf4fff57 60 const char *shortname = NULL;
a9f2c136
JH
61 struct strbuf key = STRBUF_INIT;
62 int rebasing = should_setup_rebase(origin);
63
cf4fff57 64 if (skip_prefix(remote, "refs/heads/", &shortname)
85e2233f
MM
65 && !strcmp(local, shortname)
66 && !origin) {
bc554df8 67 warning(_("Not setting branch %s as its own upstream."),
85e2233f 68 local);
27852b2c 69 return 0;
85e2233f
MM
70 }
71
a9f2c136 72 strbuf_addf(&key, "branch.%s.remote", local);
30598ad0 73 if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
27852b2c 74 goto out_err;
a9f2c136
JH
75
76 strbuf_reset(&key);
77 strbuf_addf(&key, "branch.%s.merge", local);
30598ad0 78 if (git_config_set_gently(key.buf, remote) < 0)
27852b2c 79 goto out_err;
a9f2c136
JH
80
81 if (rebasing) {
82 strbuf_reset(&key);
83 strbuf_addf(&key, "branch.%s.rebase", local);
30598ad0 84 if (git_config_set_gently(key.buf, "true") < 0)
27852b2c 85 goto out_err;
a9f2c136 86 }
d53a3503 87 strbuf_release(&key);
a9f2c136 88
72f60083 89 if (flag & BRANCH_CONFIG_VERBOSE) {
1d9aaed2 90 if (shortname) {
9fe0cf3a
A
91 if (origin)
92 printf_ln(rebasing ?
9c93ff7c
KS
93 _("Branch '%s' set up to track remote branch '%s' from '%s' by rebasing.") :
94 _("Branch '%s' set up to track remote branch '%s' from '%s'."),
9fe0cf3a
A
95 local, shortname, origin);
96 else
97 printf_ln(rebasing ?
9c93ff7c
KS
98 _("Branch '%s' set up to track local branch '%s' by rebasing.") :
99 _("Branch '%s' set up to track local branch '%s'."),
9fe0cf3a
A
100 local, shortname);
101 } else {
102 if (origin)
103 printf_ln(rebasing ?
9c93ff7c
KS
104 _("Branch '%s' set up to track remote ref '%s' by rebasing.") :
105 _("Branch '%s' set up to track remote ref '%s'."),
9fe0cf3a
A
106 local, remote);
107 else
108 printf_ln(rebasing ?
9c93ff7c
KS
109 _("Branch '%s' set up to track local ref '%s' by rebasing.") :
110 _("Branch '%s' set up to track local ref '%s'."),
9fe0cf3a
A
111 local, remote);
112 }
72f60083 113 }
27852b2c
PS
114
115 return 0;
116
117out_err:
118 strbuf_release(&key);
119 error(_("Unable to write upstream branch configuration"));
120
121 advise(_(tracking_advice),
122 origin ? origin : "",
123 origin ? "/" : "",
124 shortname ? shortname : remote);
125
126 return -1;
a9f2c136
JH
127}
128
e496c003
DB
129/*
130 * This is called when new_ref is branched off of orig_ref, and tries
131 * to infer the settings for branch.<new_ref>.{remote,merge} from the
132 * config.
133 */
27852b2c
PS
134static void setup_tracking(const char *new_ref, const char *orig_ref,
135 enum branch_track track, int quiet)
e496c003 136{
e496c003 137 struct tracking tracking;
f9a482e6 138 int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
e496c003 139
e496c003
DB
140 memset(&tracking, 0, sizeof(tracking));
141 tracking.spec.dst = (char *)orig_ref;
9ed36cfa 142 if (for_each_remote(find_tracked_branch, &tracking))
27852b2c 143 return;
e496c003 144
9ed36cfa
JS
145 if (!tracking.matches)
146 switch (track) {
147 case BRANCH_TRACK_ALWAYS:
148 case BRANCH_TRACK_EXPLICIT:
4fc50066 149 case BRANCH_TRACK_OVERRIDE:
9ed36cfa
JS
150 break;
151 default:
27852b2c 152 return;
9ed36cfa
JS
153 }
154
e496c003 155 if (tracking.matches > 1)
27852b2c
PS
156 die(_("Not tracking: ambiguous information for ref %s"),
157 orig_ref);
e496c003 158
27852b2c
PS
159 if (install_branch_config(config_flags, new_ref, tracking.remote,
160 tracking.src ? tracking.src : orig_ref) < 0)
161 exit(-1);
e496c003 162
a9f2c136 163 free(tracking.src);
e496c003
DB
164}
165
6f9a3321
JH
166int read_branch_desc(struct strbuf *buf, const char *branch_name)
167{
540b0f49 168 char *v = NULL;
6f9a3321
JH
169 struct strbuf name = STRBUF_INIT;
170 strbuf_addf(&name, "branch.%s.description", branch_name);
540b0f49
TA
171 if (git_config_get_string(name.buf, &v)) {
172 strbuf_release(&name);
173 return -1;
174 }
175 strbuf_addstr(buf, v);
176 free(v);
6f9a3321
JH
177 strbuf_release(&name);
178 return 0;
179}
180
fa799376
JH
181int validate_new_branchname(const char *name, struct strbuf *ref,
182 int force, int attr_only)
55c4a673 183{
55c4a673 184 if (strbuf_check_branch_ref(ref, name))
bc554df8 185 die(_("'%s' is not a valid branch name."), name);
55c4a673
CI
186
187 if (!ref_exists(ref->buf))
188 return 0;
fa799376 189 else if (!force && !attr_only)
bc554df8 190 die(_("A branch named '%s' already exists."), ref->buf + strlen("refs/heads/"));
55c4a673 191
fa799376
JH
192 if (!attr_only) {
193 const char *head;
55c4a673 194
744c040b 195 head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
fa799376 196 if (!is_bare_repository() && head && !strcmp(head, ref->buf))
bc554df8 197 die(_("Cannot force update the current branch."));
fa799376 198 }
55c4a673
CI
199 return 1;
200}
201
41c21f22
JH
202static int check_tracking_branch(struct remote *remote, void *cb_data)
203{
204 char *tracking_branch = cb_data;
205 struct refspec query;
206 memset(&query, 0, sizeof(struct refspec));
207 query.dst = tracking_branch;
1d7358c5 208 return !remote_find_tracking(remote, &query);
41c21f22
JH
209}
210
211static int validate_remote_tracking_branch(char *ref)
212{
213 return !for_each_remote(check_tracking_branch, ref);
214}
215
e2b6aa5f 216static const char upstream_not_branch[] =
1a15d00b 217N_("Cannot setup tracking information; starting point '%s' is not a branch.");
a5e91c72 218static const char upstream_missing[] =
caa2036b
JK
219N_("the requested upstream branch '%s' does not exist");
220static const char upstream_advice[] =
221N_("\n"
222"If you are planning on basing your work on an upstream\n"
223"branch that already exists at the remote, you may need to\n"
224"run \"git fetch\" to retrieve it.\n"
225"\n"
226"If you are planning to push out a new local branch that\n"
227"will track its remote counterpart, you may want to use\n"
228"\"git push -u\" to set the upstream config as you push.");
e2b6aa5f 229
4bd488ea 230void create_branch(const char *name, const char *start_name,
39bd6f72 231 int force, int reflog, int clobber_head,
f9a482e6 232 int quiet, enum branch_track track)
e496c003 233{
e496c003 234 struct commit *commit;
48713bfa 235 struct object_id oid;
3818b258 236 char *real_ref;
8415d5c7 237 struct strbuf ref = STRBUF_INIT;
e496c003 238 int forcing = 0;
4fc50066
IL
239 int dont_change_ref = 0;
240 int explicit_tracking = 0;
241
242 if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
243 explicit_tracking = 1;
e496c003 244
fa799376 245 if (validate_new_branchname(name, &ref, force,
39bd6f72
JN
246 track == BRANCH_TRACK_OVERRIDE ||
247 clobber_head)) {
55c4a673 248 if (!force)
4fc50066 249 dont_change_ref = 1;
55c4a673
CI
250 else
251 forcing = 1;
e496c003
DB
252 }
253
254 real_ref = NULL;
48713bfa 255 if (get_oid(start_name, &oid)) {
caa2036b
JK
256 if (explicit_tracking) {
257 if (advice_set_upstream_failure) {
258 error(_(upstream_missing), start_name);
259 advise(_(upstream_advice));
260 exit(1);
261 }
1a15d00b 262 die(_(upstream_missing), start_name);
caa2036b 263 }
bc554df8 264 die(_("Not a valid object name: '%s'."), start_name);
a5e91c72 265 }
e496c003 266
48713bfa 267 switch (dwim_ref(start_name, strlen(start_name), oid.hash, &real_ref)) {
e496c003
DB
268 case 0:
269 /* Not branching from any existing branch */
4fc50066 270 if (explicit_tracking)
1a15d00b 271 die(_(upstream_not_branch), start_name);
e496c003
DB
272 break;
273 case 1:
21b5b1e8 274 /* Unique completion -- good, only if it is a real branch */
59556548 275 if (!starts_with(real_ref, "refs/heads/") &&
41c21f22 276 validate_remote_tracking_branch(real_ref)) {
21b5b1e8 277 if (explicit_tracking)
1a15d00b 278 die(_(upstream_not_branch), start_name);
21b5b1e8
JH
279 else
280 real_ref = NULL;
281 }
e496c003
DB
282 break;
283 default:
bc554df8 284 die(_("Ambiguous object name: '%s'."), start_name);
e496c003
DB
285 break;
286 }
287
bc83266a 288 if ((commit = lookup_commit_reference(&oid)) == NULL)
bc554df8 289 die(_("Not a valid branch point: '%s'."), start_name);
48713bfa 290 oidcpy(&oid, &commit->object.oid);
e496c003 291
d43f990f 292 if (reflog)
341fb286 293 log_all_ref_updates = LOG_REFS_NORMAL;
d43f990f
RS
294
295 if (!dont_change_ref) {
296 struct ref_transaction *transaction;
297 struct strbuf err = STRBUF_INIT;
cddac452 298 char *msg;
3818b258
JK
299
300 if (forcing)
cddac452 301 msg = xstrfmt("branch: Reset to %s", start_name);
3818b258 302 else
cddac452 303 msg = xstrfmt("branch: Created from %s", start_name);
d43f990f
RS
304
305 transaction = ref_transaction_begin(&err);
306 if (!transaction ||
1d147bdf 307 ref_transaction_update(transaction, ref.buf,
48713bfa 308 oid.hash, forcing ? NULL : null_sha1,
1d147bdf 309 0, msg, &err) ||
db7516ab 310 ref_transaction_commit(transaction, &err))
d43f990f
RS
311 die("%s", err.buf);
312 ref_transaction_free(transaction);
313 strbuf_release(&err);
cddac452 314 free(msg);
d43f990f
RS
315 }
316
e496c003 317 if (real_ref && track)
82a0672f 318 setup_tracking(ref.buf + 11, real_ref, track, quiet);
e496c003 319
8415d5c7 320 strbuf_release(&ref);
9ed36cfa 321 free(real_ref);
e496c003 322}
c369e7b8
DB
323
324void remove_branch_state(void)
325{
f932729c
JK
326 unlink(git_path_cherry_pick_head());
327 unlink(git_path_revert_head());
328 unlink(git_path_merge_head());
329 unlink(git_path_merge_rr());
330 unlink(git_path_merge_msg());
331 unlink(git_path_merge_mode());
332 unlink(git_path_squash_msg());
c369e7b8 333}
ed89f84b 334
8d9fdd70 335void die_if_checked_out(const char *branch, int ignore_current_worktree)
41af6565 336{
d3b9ac07 337 const struct worktree *wt;
41af6565 338
d3b9ac07 339 wt = find_shared_symref("HEAD", branch);
8d9fdd70 340 if (!wt || (ignore_current_worktree && wt->is_current))
d3b9ac07
NTND
341 return;
342 skip_prefix(branch, "refs/heads/", &branch);
343 die(_("'%s' is already checked out at '%s'"),
344 branch, wt->path);
ed89f84b 345}
70999e9c 346
39ee4c6c
KM
347int replace_each_worktree_head_symref(const char *oldref, const char *newref,
348 const char *logmsg)
70999e9c
KY
349{
350 int ret = 0;
4fff1ef7 351 struct worktree **worktrees = get_worktrees(0);
70999e9c
KY
352 int i;
353
354 for (i = 0; worktrees[i]; i++) {
d026a256
NTND
355 struct ref_store *refs;
356
70999e9c
KY
357 if (worktrees[i]->is_detached)
358 continue;
31824d18
NTND
359 if (!worktrees[i]->head_ref)
360 continue;
361 if (strcmp(oldref, worktrees[i]->head_ref))
70999e9c
KY
362 continue;
363
d026a256
NTND
364 refs = get_worktree_ref_store(worktrees[i]);
365 if (refs_create_symref(refs, "HEAD", newref, logmsg))
366 ret = error(_("HEAD of working tree %s is not updated"),
367 worktrees[i]->path);
70999e9c
KY
368 }
369
370 free_worktrees(worktrees);
371 return ret;
372}