worktree.c: make find_shared_symref() return struct worktree *
[git/git.git] / builtin / branch.c
CommitLineData
c31820c2
LH
1/*
2 * Builtin "git branch"
3 *
d972cce0 4 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
c31820c2
LH
5 * Based on git-branch.sh by Junio C Hamano.
6 */
7
8#include "cache.h"
85023577 9#include "color.h"
c31820c2
LH
10#include "refs.h"
11#include "commit.h"
12#include "builtin.h"
6f084a56 13#include "remote.h"
a8dfd5ea 14#include "parse-options.h"
e496c003 15#include "branch.h"
68067ca1
JH
16#include "diff.h"
17#include "revision.h"
ebe31ef2
NTND
18#include "string-list.h"
19#include "column.h"
1452bd64 20#include "utf8.h"
c8183cd2 21#include "wt-status.h"
1511b22d 22#include "ref-filter.h"
f292244c 23#include "worktree.h"
a8dfd5ea
PH
24
25static const char * const builtin_branch_usage[] = {
9c9b4f2f
AH
26 N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
27 N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
28 N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
29 N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
aa3bc55e 30 N_("git branch [<options>] [-r | -a] [--points-at]"),
a8dfd5ea
PH
31 NULL
32};
c31820c2 33
c31820c2
LH
34static const char *head;
35static unsigned char head_sha1[20];
36
6b2f2d98 37static int branch_use_color = -1;
a1158cae 38static char branch_colors[][COLOR_MAXLEN] = {
dc6ebd4c
AL
39 GIT_COLOR_RESET,
40 GIT_COLOR_NORMAL, /* PLAIN */
41 GIT_COLOR_RED, /* REMOTE */
42 GIT_COLOR_NORMAL, /* LOCAL */
43 GIT_COLOR_GREEN, /* CURRENT */
dbda21fa 44 GIT_COLOR_BLUE, /* UPSTREAM */
a1158cae
AP
45};
46enum color_branch {
74bb2dfb
AL
47 BRANCH_COLOR_RESET = 0,
48 BRANCH_COLOR_PLAIN = 1,
49 BRANCH_COLOR_REMOTE = 2,
50 BRANCH_COLOR_LOCAL = 3,
dbda21fa
FC
51 BRANCH_COLOR_CURRENT = 4,
52 BRANCH_COLOR_UPSTREAM = 5
a1158cae
AP
53};
54
ebe31ef2
NTND
55static struct string_list output = STRING_LIST_INIT_DUP;
56static unsigned int colopts;
57
8852117a 58static int parse_branch_color_slot(const char *slot)
a1158cae 59{
8852117a 60 if (!strcasecmp(slot, "plain"))
74bb2dfb 61 return BRANCH_COLOR_PLAIN;
8852117a 62 if (!strcasecmp(slot, "reset"))
74bb2dfb 63 return BRANCH_COLOR_RESET;
8852117a 64 if (!strcasecmp(slot, "remote"))
74bb2dfb 65 return BRANCH_COLOR_REMOTE;
8852117a 66 if (!strcasecmp(slot, "local"))
74bb2dfb 67 return BRANCH_COLOR_LOCAL;
8852117a 68 if (!strcasecmp(slot, "current"))
74bb2dfb 69 return BRANCH_COLOR_CURRENT;
8852117a 70 if (!strcasecmp(slot, "upstream"))
dbda21fa 71 return BRANCH_COLOR_UPSTREAM;
8b8e8624 72 return -1;
a1158cae
AP
73}
74
ef90d6d4 75static int git_branch_config(const char *var, const char *value, void *cb)
a1158cae 76{
e3f1da98
RS
77 const char *slot_name;
78
59556548 79 if (starts_with(var, "column."))
ebe31ef2 80 return git_column_config(var, value, "branch", &colopts);
a1158cae 81 if (!strcmp(var, "color.branch")) {
e269eb79 82 branch_use_color = git_config_colorbool(var, value);
a1158cae
AP
83 return 0;
84 }
e3f1da98 85 if (skip_prefix(var, "color.branch.", &slot_name)) {
b9465768 86 int slot = parse_branch_color_slot(slot_name);
8b8e8624
JK
87 if (slot < 0)
88 return 0;
5768c98a
JH
89 if (!value)
90 return config_error_nonbool(var);
f6c5a296 91 return color_parse(value, branch_colors[slot]);
a1158cae 92 }
ef90d6d4 93 return git_color_default_config(var, value, cb);
a1158cae
AP
94}
95
52fae7de 96static const char *branch_get_color(enum color_branch ix)
a1158cae 97{
daa0c3d9 98 if (want_color(branch_use_color))
a1158cae
AP
99 return branch_colors[ix];
100 return "";
101}
102
99c419c9
JH
103static int branch_merged(int kind, const char *name,
104 struct commit *rev, struct commit *head_rev)
105{
106 /*
107 * This checks whether the merge bases of branch and HEAD (or
108 * the other branch this branch builds upon) contains the
109 * branch, which means that the branch has already been merged
110 * safely to HEAD (or the other branch).
111 */
112 struct commit *reference_rev = NULL;
113 const char *reference_name = NULL;
96ec7b1e 114 void *reference_name_to_free = NULL;
99c419c9
JH
115 int merged;
116
1511b22d 117 if (kind == FILTER_REFS_BRANCHES) {
99c419c9 118 struct branch *branch = branch_get(name);
3a429d0a 119 const char *upstream = branch_get_upstream(branch, NULL);
99c419c9
JH
120 unsigned char sha1[20];
121
a9f9f8cc 122 if (upstream &&
96ec7b1e 123 (reference_name = reference_name_to_free =
a9f9f8cc 124 resolve_refdup(upstream, RESOLVE_REF_READING,
7695d118 125 sha1, NULL)) != NULL)
99c419c9
JH
126 reference_rev = lookup_commit_reference(sha1);
127 }
128 if (!reference_rev)
129 reference_rev = head_rev;
130
a20efee9 131 merged = in_merge_bases(rev, reference_rev);
99c419c9
JH
132
133 /*
134 * After the safety valve is fully redefined to "check with
135 * upstream, if any, otherwise with HEAD", we should just
136 * return the result of the in_merge_bases() above without
137 * any of the following code, but during the transition period,
138 * a gentle reminder is in order.
139 */
140 if ((head_rev != reference_rev) &&
a20efee9 141 in_merge_bases(rev, head_rev) != merged) {
99c419c9 142 if (merged)
49df4b02 143 warning(_("deleting branch '%s' that has been merged to\n"
6c80cd29 144 " '%s', but not yet merged to HEAD."),
99c419c9
JH
145 name, reference_name);
146 else
49df4b02
ÆAB
147 warning(_("not deleting branch '%s' that is not yet merged to\n"
148 " '%s', even though it is merged to HEAD."),
99c419c9
JH
149 name, reference_name);
150 }
96ec7b1e 151 free(reference_name_to_free);
99c419c9
JH
152 return merged;
153}
154
f5d0e162 155static int check_branch_commit(const char *branchname, const char *refname,
4eaa4bd8 156 const unsigned char *sha1, struct commit *head_rev,
f5d0e162
RS
157 int kinds, int force)
158{
159 struct commit *rev = lookup_commit_reference(sha1);
160 if (!rev) {
161 error(_("Couldn't look up commit object for '%s'"), refname);
162 return -1;
163 }
164 if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
165 error(_("The branch '%s' is not fully merged.\n"
166 "If you are sure you want to delete it, "
167 "run 'git branch -D %s'."), branchname, branchname);
168 return -1;
169 }
170 return 0;
171}
172
22ed7927
RS
173static void delete_branch_config(const char *branchname)
174{
175 struct strbuf buf = STRBUF_INIT;
176 strbuf_addf(&buf, "branch.%s", branchname);
177 if (git_config_rename_section(buf.buf, NULL) < 0)
178 warning(_("Update of config-file failed"));
179 strbuf_release(&buf);
180}
181
d65ddf19
JK
182static int delete_branches(int argc, const char **argv, int force, int kinds,
183 int quiet)
c31820c2 184{
f5d0e162 185 struct commit *head_rev = NULL;
c31820c2 186 unsigned char sha1[20];
b8e9a00d 187 char *name = NULL;
c179837c 188 const char *fmt;
c31820c2 189 int i;
b8e9a00d 190 int ret = 0;
c179837c 191 int remote_branch = 0;
8415d5c7 192 struct strbuf bname = STRBUF_INIT;
c31820c2 193
f3d985c3 194 switch (kinds) {
1511b22d 195 case FILTER_REFS_REMOTES:
f3d985c3 196 fmt = "refs/remotes/%s";
c179837c
ÆAB
197 /* For subsequent UI messages */
198 remote_branch = 1;
199
f3d985c3
JH
200 force = 1;
201 break;
1511b22d 202 case FILTER_REFS_BRANCHES:
f3d985c3 203 fmt = "refs/heads/%s";
f3d985c3
JH
204 break;
205 default:
49df4b02 206 die(_("cannot use -a with -d"));
f3d985c3 207 }
c31820c2 208
67affd51
JH
209 if (!force) {
210 head_rev = lookup_commit_reference(head_sha1);
211 if (!head_rev)
49df4b02 212 die(_("Couldn't look up commit object for HEAD"));
67affd51 213 }
8415d5c7 214 for (i = 0; i < argc; i++, strbuf_release(&bname)) {
0fe700e3
RS
215 const char *target;
216 int flags = 0;
217
a552de75 218 strbuf_branchname(&bname, argv[i]);
8e0f7003 219 free(name);
4e2d094d 220 name = mkpathdup(fmt, bname.buf);
f292244c
KY
221
222 if (kinds == FILTER_REFS_BRANCHES) {
d3b9ac07
NTND
223 const struct worktree *wt =
224 find_shared_symref("HEAD", name);
225 if (wt) {
f292244c
KY
226 error(_("Cannot delete branch '%s' "
227 "checked out at '%s'"),
d3b9ac07 228 bname.buf, wt->path);
f292244c
KY
229 ret = 1;
230 continue;
231 }
232 }
233
18f29fc6
RS
234 target = resolve_ref_unsafe(name,
235 RESOLVE_REF_READING
d0f810f0
RS
236 | RESOLVE_REF_NO_RECURSE
237 | RESOLVE_REF_ALLOW_BAD_NAME,
62a2d525 238 sha1, &flags);
18f29fc6 239 if (!target) {
c179837c 240 error(remote_branch
ccd593cf 241 ? _("remote-tracking branch '%s' not found.")
c179837c 242 : _("branch '%s' not found."), bname.buf);
b8e9a00d
QT
243 ret = 1;
244 continue;
245 }
c31820c2 246
d0f810f0 247 if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
0fe700e3 248 check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
f5d0e162 249 force)) {
b8e9a00d
QT
250 ret = 1;
251 continue;
c31820c2
LH
252 }
253
1c03c4d3
MH
254 if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1,
255 REF_NODEREF)) {
c179837c 256 error(remote_branch
ccd593cf 257 ? _("Error deleting remote-tracking branch '%s'")
c179837c 258 : _("Error deleting branch '%s'"),
8415d5c7 259 bname.buf);
b8e9a00d 260 ret = 1;
13baa9fe
RS
261 continue;
262 }
263 if (!quiet) {
264 printf(remote_branch
ccd593cf 265 ? _("Deleted remote-tracking branch %s (was %s).\n")
13baa9fe
RS
266 : _("Deleted branch %s (was %s).\n"),
267 bname.buf,
d0f810f0
RS
268 (flags & REF_ISBROKEN) ? "broken"
269 : (flags & REF_ISSYMREF) ? target
13baa9fe 270 : find_unique_abbrev(sha1, DEFAULT_ABBREV));
f1eccbab 271 }
13baa9fe 272 delete_branch_config(bname.buf);
c31820c2 273 }
c31820c2 274
8e0f7003 275 free(name);
b8e9a00d
QT
276
277 return(ret);
c31820c2 278}
c31820c2 279
2d8a7f0b
JK
280static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
281 int show_upstream_ref)
94fcb730
JH
282{
283 int ours, theirs;
21dfc09d 284 char *ref = NULL;
94fcb730 285 struct branch *branch = branch_get(branch_name);
979cb245 286 const char *upstream;
dbda21fa 287 struct strbuf fancy = STRBUF_INIT;
f2e08739 288 int upstream_is_gone = 0;
6b364d48 289 int added_decoration = 1;
94fcb730 290
979cb245
JK
291 if (stat_tracking_info(branch, &ours, &theirs, &upstream) < 0) {
292 if (!upstream)
293 return;
f2e08739 294 upstream_is_gone = 1;
2d8a7f0b
JK
295 }
296
dbda21fa 297 if (show_upstream_ref) {
979cb245 298 ref = shorten_unambiguous_ref(upstream, 0);
dbda21fa
FC
299 if (want_color(branch_use_color))
300 strbuf_addf(&fancy, "%s%s%s",
301 branch_get_color(BRANCH_COLOR_UPSTREAM),
302 ref, branch_get_color(BRANCH_COLOR_RESET));
303 else
304 strbuf_addstr(&fancy, ref);
305 }
306
f2e08739
JX
307 if (upstream_is_gone) {
308 if (show_upstream_ref)
309 strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
6b364d48
TH
310 else
311 added_decoration = 0;
f2e08739
JX
312 } else if (!ours && !theirs) {
313 if (show_upstream_ref)
314 strbuf_addf(stat, _("[%s]"), fancy.buf);
6b364d48
TH
315 else
316 added_decoration = 0;
f2e08739
JX
317 } else if (!ours) {
318 if (show_upstream_ref)
dbda21fa 319 strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs);
21dfc09d
NTND
320 else
321 strbuf_addf(stat, _("[behind %d]"), theirs);
322
323 } else if (!theirs) {
f2e08739 324 if (show_upstream_ref)
dbda21fa 325 strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours);
21dfc09d
NTND
326 else
327 strbuf_addf(stat, _("[ahead %d]"), ours);
328 } else {
f2e08739 329 if (show_upstream_ref)
21dfc09d 330 strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
dbda21fa 331 fancy.buf, ours, theirs);
21dfc09d
NTND
332 else
333 strbuf_addf(stat, _("[ahead %d, behind %d]"),
334 ours, theirs);
335 }
dbda21fa 336 strbuf_release(&fancy);
6b364d48
TH
337 if (added_decoration)
338 strbuf_addch(stat, ' ');
21dfc09d 339 free(ref);
94fcb730
JH
340}
341
1511b22d 342static void add_verbose_info(struct strbuf *out, struct ref_array_item *item,
aedcb7dc 343 struct ref_filter *filter, const char *refname)
6e0332ec
JN
344{
345 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
045e3884 346 const char *sub = _(" **** invalid ref ****");
6e0332ec
JN
347 struct commit *commit = item->commit;
348
5e7d4d3e 349 if (!parse_commit(commit)) {
f67d2e82 350 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
6e0332ec
JN
351 sub = subject.buf;
352 }
353
1511b22d 354 if (item->kind == FILTER_REFS_BRANCHES)
aedcb7dc 355 fill_tracking_info(&stat, refname, filter->verbose > 1);
6e0332ec
JN
356
357 strbuf_addf(out, " %s %s%s",
ed1c9977 358 find_unique_abbrev(item->commit->object.oid.hash, filter->abbrev),
6e0332ec
JN
359 stat.buf, sub);
360 strbuf_release(&stat);
361 strbuf_release(&subject);
362}
363
2dad24a5
KN
364static char *get_head_description(void)
365{
366 struct strbuf desc = STRBUF_INIT;
367 struct wt_status_state state;
368 memset(&state, 0, sizeof(state));
369 wt_status_get_state(&state, 1);
370 if (state.rebase_in_progress ||
371 state.rebase_interactive_in_progress)
372 strbuf_addf(&desc, _("(no branch, rebasing %s)"),
373 state.branch);
374 else if (state.bisect_in_progress)
375 strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
376 state.branch);
377 else if (state.detached_from) {
378 /* TRANSLATORS: make sure these match _("HEAD detached at ")
379 and _("HEAD detached from ") in wt-status.c */
380 if (state.detached_at)
381 strbuf_addf(&desc, _("(HEAD detached at %s)"),
382 state.detached_from);
383 else
384 strbuf_addf(&desc, _("(HEAD detached from %s)"),
385 state.detached_from);
386 }
387 else
388 strbuf_addstr(&desc, _("(no branch)"));
389 free(state.branch);
390 free(state.onto);
391 free(state.detached_from);
392 return strbuf_detach(&desc, NULL);
393}
394
aedcb7dc
KN
395static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth,
396 struct ref_filter *filter, const char *remote_prefix)
75e6e213 397{
af0e4ac0 398 char c;
f65f1391 399 int current = 0;
af0e4ac0 400 int color;
209d336a 401 struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
95c38fb0
JK
402 const char *prefix_to_show = "";
403 const char *prefix_to_skip = NULL;
1511b22d 404 const char *desc = item->refname;
23e714df 405 char *to_free = NULL;
75e6e213 406
af0e4ac0 407 switch (item->kind) {
1511b22d 408 case FILTER_REFS_BRANCHES:
95c38fb0
JK
409 prefix_to_skip = "refs/heads/";
410 skip_prefix(desc, prefix_to_skip, &desc);
aedcb7dc 411 if (!filter->detached && !strcmp(desc, head))
f65f1391
KN
412 current = 1;
413 else
414 color = BRANCH_COLOR_LOCAL;
af0e4ac0 415 break;
1511b22d 416 case FILTER_REFS_REMOTES:
95c38fb0
JK
417 prefix_to_skip = "refs/remotes/";
418 skip_prefix(desc, prefix_to_skip, &desc);
74bb2dfb 419 color = BRANCH_COLOR_REMOTE;
95c38fb0 420 prefix_to_show = remote_prefix;
af0e4ac0 421 break;
1511b22d 422 case FILTER_REFS_DETACHED_HEAD:
23e714df 423 desc = to_free = get_head_description();
f65f1391 424 current = 1;
af0e4ac0
LH
425 break;
426 default:
74bb2dfb 427 color = BRANCH_COLOR_PLAIN;
af0e4ac0
LH
428 break;
429 }
75e6e213 430
af0e4ac0
LH
431 c = ' ';
432 if (current) {
433 c = '*';
74bb2dfb 434 color = BRANCH_COLOR_CURRENT;
af0e4ac0 435 }
75e6e213 436
95c38fb0 437 strbuf_addf(&name, "%s%s", prefix_to_show, desc);
1511b22d 438 if (filter->verbose) {
1452bd64 439 int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf);
209d336a 440 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
1452bd64 441 maxwidth + utf8_compensation, name.buf,
81474267 442 branch_get_color(BRANCH_COLOR_RESET));
1452bd64 443 } else
209d336a 444 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
81474267 445 name.buf, branch_get_color(BRANCH_COLOR_RESET));
209d336a 446
aedcb7dc 447 if (item->symref) {
95c38fb0
JK
448 const char *symref = item->symref;
449 if (prefix_to_skip)
450 skip_prefix(symref, prefix_to_skip, &symref);
451 strbuf_addf(&out, " -> %s", symref);
aedcb7dc 452 }
1511b22d 453 else if (filter->verbose)
6e0332ec 454 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
aedcb7dc 455 add_verbose_info(&out, item, filter, desc);
ebe31ef2 456 if (column_active(colopts)) {
1511b22d 457 assert(!filter->verbose && "--column and --verbose are incompatible");
ebe31ef2
NTND
458 string_list_append(&output, out.buf);
459 } else {
460 printf("%s\n", out.buf);
461 }
209d336a
JS
462 strbuf_release(&name);
463 strbuf_release(&out);
23e714df 464 free(to_free);
75e6e213
LH
465}
466
1511b22d 467static int calc_maxwidth(struct ref_array *refs, int remote_bonus)
7e9ff00b 468{
1051e40d 469 int i, max = 0;
1511b22d
KN
470 for (i = 0; i < refs->nr; i++) {
471 struct ref_array_item *it = refs->items[i];
aedcb7dc 472 const char *desc = it->refname;
1051e40d
KN
473 int w;
474
aedcb7dc
KN
475 skip_prefix(it->refname, "refs/heads/", &desc);
476 skip_prefix(it->refname, "refs/remotes/", &desc);
477 w = utf8_strwidth(desc);
478
1511b22d 479 if (it->kind == FILTER_REFS_REMOTES)
1051e40d
KN
480 w += remote_bonus;
481 if (w > max)
482 max = w;
7e9ff00b 483 }
1051e40d 484 return max;
7e9ff00b
LT
485}
486
aedcb7dc 487static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting)
c31820c2
LH
488{
489 int i;
1511b22d 490 struct ref_array array;
1051e40d
KN
491 int maxwidth = 0;
492 const char *remote_prefix = "";
493
35257aa0 494 /*
1051e40d
KN
495 * If we are listing more than just remote branches,
496 * then remote branches will have a "remotes/" prefix.
497 * We need to account for this in the width.
35257aa0 498 */
1511b22d 499 if (filter->kind != FILTER_REFS_REMOTES)
1051e40d 500 remote_prefix = "remotes/";
8376a704 501
1511b22d 502 memset(&array, 0, sizeof(array));
8376a704 503
aedcb7dc
KN
504 verify_ref_format("%(refname)%(symref)");
505 filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN);
c31820c2 506
1511b22d
KN
507 if (filter->verbose)
508 maxwidth = calc_maxwidth(&array, strlen(remote_prefix));
bfcc9214 509
aedcb7dc
KN
510 /*
511 * If no sorting parameter is given then we default to sorting
512 * by 'refname'. This would give us an alphabetically sorted
513 * array with the 'HEAD' ref at the beginning followed by
514 * local branches 'refs/heads/...' and finally remote-tacking
515 * branches 'refs/remotes/...'.
516 */
517 if (!sorting)
518 sorting = ref_default_sorting();
519 ref_array_sort(sorting, &array);
1603ade8 520
1511b22d 521 for (i = 0; i < array.nr; i++)
aedcb7dc 522 format_and_print_ref_item(array.items[i], maxwidth, filter, remote_prefix);
0e9716e6 523
1511b22d 524 ref_array_clear(&array);
c31820c2
LH
525}
526
c976d415
LH
527static void rename_branch(const char *oldname, const char *newname, int force)
528{
da3f78a2 529 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
da3f78a2 530 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
cbdffe40 531 int recovery = 0;
3f59481e 532 int clobber_head_ok;
c976d415 533
c847f537 534 if (!oldname)
49df4b02 535 die(_("cannot rename the current branch while not on any."));
c847f537 536
cbdffe40
JH
537 if (strbuf_check_branch_ref(&oldref, oldname)) {
538 /*
539 * Bad name --- this could be an attempt to rename a
540 * ref that we used to allow to be created by accident.
541 */
c6893323 542 if (ref_exists(oldref.buf))
cbdffe40
JH
543 recovery = 1;
544 else
49df4b02 545 die(_("Invalid branch name: '%s'"), oldname);
cbdffe40 546 }
c976d415 547
3f59481e
JN
548 /*
549 * A command like "git branch -M currentbranch currentbranch" cannot
550 * cause the worktree to become inconsistent with HEAD, so allow it.
551 */
552 clobber_head_ok = !strcmp(oldname, newname);
553
554 validate_new_branchname(newname, &newref, force, clobber_head_ok);
c976d415 555
da3f78a2
MV
556 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
557 oldref.buf, newref.buf);
678d0f4c 558
da3f78a2 559 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
49df4b02 560 die(_("Branch rename failed"));
da3f78a2 561 strbuf_release(&logmsg);
c976d415 562
cbdffe40 563 if (recovery)
49df4b02 564 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
cbdffe40 565
70999e9c 566 if (replace_each_worktree_head_symref(oldref.buf, newref.buf))
49df4b02 567 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
19eba151 568
da3f78a2
MV
569 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
570 strbuf_release(&oldref);
571 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
572 strbuf_release(&newref);
573 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
49df4b02 574 die(_("Branch is renamed, but update of config-file failed"));
da3f78a2
MV
575 strbuf_release(&oldsection);
576 strbuf_release(&newsection);
c976d415
LH
577}
578
b7200e83
JH
579static const char edit_description[] = "BRANCH_DESCRIPTION";
580
581static int edit_branch_description(const char *branch_name)
582{
b7200e83
JH
583 struct strbuf buf = STRBUF_INIT;
584 struct strbuf name = STRBUF_INIT;
585
586 read_branch_desc(&buf, branch_name);
587 if (!buf.len || buf.buf[buf.len-1] != '\n')
588 strbuf_addch(&buf, '\n');
eff80a9f
JH
589 strbuf_commented_addf(&buf,
590 "Please edit the description for the branch\n"
591 " %s\n"
592 "Lines starting with '%c' will be stripped.\n",
593 branch_name, comment_line_char);
12d6ce1d 594 if (write_file_gently(git_path(edit_description), "%s", buf.buf)) {
b7200e83 595 strbuf_release(&buf);
82247e9b 596 return error(_("could not write branch description template: %s"),
b7200e83
JH
597 strerror(errno));
598 }
599 strbuf_reset(&buf);
600 if (launch_editor(git_path(edit_description), &buf, NULL)) {
601 strbuf_release(&buf);
602 return -1;
603 }
63af4a84 604 strbuf_stripspace(&buf, 1);
b7200e83
JH
605
606 strbuf_addf(&name, "branch.%s.description", branch_name);
3d180648 607 git_config_set(name.buf, buf.len ? buf.buf : NULL);
b7200e83
JH
608 strbuf_release(&name);
609 strbuf_release(&buf);
610
bd25f890 611 return 0;
b7200e83
JH
612}
613
c31820c2
LH
614int cmd_branch(int argc, const char **argv, const char *prefix)
615{
356e91f2 616 int delete = 0, rename = 0, force = 0, list = 0;
b7200e83 617 int reflog = 0, edit_description = 0;
b84869ef 618 int quiet = 0, unset_upstream = 0;
6183d826 619 const char *new_upstream = NULL;
9ed36cfa 620 enum branch_track track;
1511b22d 621 struct ref_filter filter;
aedcb7dc 622 static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
a8dfd5ea
PH
623
624 struct option options[] = {
24a85214 625 OPT_GROUP(N_("Generic options")),
1511b22d 626 OPT__VERBOSE(&filter.verbose,
24a85214
NTND
627 N_("show hash and subject, give twice for upstream branch")),
628 OPT__QUIET(&quiet, N_("suppress informational messages")),
629 OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
9ed36cfa 630 BRANCH_TRACK_EXPLICIT),
24a85214 631 OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
4fc50066 632 BRANCH_TRACK_OVERRIDE),
6183d826 633 OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
d5d09d47 634 OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
24a85214 635 OPT__COLOR(&branch_use_color, N_("use colored output")),
1511b22d
KN
636 OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"),
637 FILTER_REFS_REMOTES),
638 OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")),
639 OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")),
640 OPT__ABBREV(&filter.abbrev),
a8dfd5ea 641
24a85214 642 OPT_GROUP(N_("Specific git-branch actions:")),
1511b22d
KN
643 OPT_SET_INT('a', "all", &filter.kind, N_("list both remote-tracking and local branches"),
644 FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES),
24a85214
NTND
645 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
646 OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
647 OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
648 OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
d5d09d47
SB
649 OPT_BOOL(0, "list", &list, N_("list branch names")),
650 OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
651 OPT_BOOL(0, "edit-description", &edit_description,
652 N_("edit the description for the branch")),
356e91f2 653 OPT__FORCE(&force, N_("force creation, move/rename, deletion")),
1511b22d
KN
654 OPT_MERGED(&filter, N_("print only branches that are merged")),
655 OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
24a85214 656 OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
aedcb7dc
KN
657 OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
658 N_("field name to sort on"), &parse_opt_ref_sorting),
049716b3 659 {
aa3bc55e
KN
660 OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
661 N_("print only branches of the object"), 0, parse_opt_object_name
049716b3 662 },
a8dfd5ea
PH
663 OPT_END(),
664 };
c31820c2 665
1511b22d
KN
666 memset(&filter, 0, sizeof(filter));
667 filter.kind = FILTER_REFS_BRANCHES;
668 filter.abbrev = -1;
669
1dacfbcf
NTND
670 if (argc == 2 && !strcmp(argv[1], "-h"))
671 usage_with_options(builtin_branch_usage, options);
672
ef90d6d4 673 git_config(git_branch_config, NULL);
6b2f2d98 674
9ed36cfa 675 track = git_branch_track;
c976d415 676
7695d118 677 head = resolve_refdup("HEAD", 0, head_sha1, NULL);
c31820c2 678 if (!head)
49df4b02 679 die(_("Failed to resolve HEAD as a valid ref."));
e3f1da98 680 if (!strcmp(head, "HEAD"))
1511b22d 681 filter.detached = 1;
e3f1da98
RS
682 else if (!skip_prefix(head, "refs/heads/", &head))
683 die(_("HEAD not found below refs/heads!"));
ebe31ef2 684
37782920
SB
685 argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
686 0);
cddd127b 687
b84869ef 688 if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
cddd127b
MG
689 list = 1;
690
aa3bc55e 691 if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr)
d0403508
JK
692 list = 1;
693
356e91f2 694 if (!!delete + !!rename + !!new_upstream +
05efb7b7 695 list + unset_upstream > 1)
049716b3 696 usage_with_options(builtin_branch_usage, options);
c31820c2 697
1511b22d
KN
698 if (filter.abbrev == -1)
699 filter.abbrev = DEFAULT_ABBREV;
ebe31ef2 700 finalize_colopts(&colopts, -1);
1511b22d 701 if (filter.verbose) {
ebe31ef2
NTND
702 if (explicitly_enable_column(colopts))
703 die(_("--column and --verbose are incompatible"));
704 colopts = 0;
705 }
b792c067 706
356e91f2
MG
707 if (force) {
708 delete *= 2;
709 rename *= 2;
710 }
711
640d0401
NTND
712 if (delete) {
713 if (!argc)
714 die(_("branch name required"));
1511b22d 715 return delete_branches(argc, argv, delete > 1, filter.kind, quiet);
640d0401 716 } else if (list) {
23e714df 717 /* git branch --local also shows HEAD when it is detached */
1511b22d
KN
718 if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
719 filter.kind |= FILTER_REFS_DETACHED_HEAD;
720 filter.name_patterns = argv;
aedcb7dc 721 print_ref_list(&filter, sorting);
ebe31ef2
NTND
722 print_columns(&output, colopts, NULL);
723 string_list_clear(&output, 0);
ca417990 724 return 0;
ebe31ef2 725 }
b7200e83
JH
726 else if (edit_description) {
727 const char *branch_name;
c2d17ba3
JH
728 struct strbuf branch_ref = STRBUF_INIT;
729
75135b23 730 if (!argc) {
1511b22d 731 if (filter.detached)
045e3884 732 die(_("Cannot give description to detached HEAD"));
b7200e83 733 branch_name = head;
75135b23 734 } else if (argc == 1)
b7200e83
JH
735 branch_name = argv[0];
736 else
43722c4d 737 die(_("cannot edit description of more than one branch"));
c2d17ba3
JH
738
739 strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
740 if (!ref_exists(branch_ref.buf)) {
741 strbuf_release(&branch_ref);
742
743 if (!argc)
045e3884 744 return error(_("No commit on branch '%s' yet."),
c2d17ba3
JH
745 branch_name);
746 else
045e3884
NTND
747 return error(_("No branch named '%s'."),
748 branch_name);
c2d17ba3
JH
749 }
750 strbuf_release(&branch_ref);
751
b7200e83
JH
752 if (edit_branch_description(branch_name))
753 return 1;
a4043aea 754 } else if (rename) {
d1520c4b
JM
755 if (!argc)
756 die(_("branch name required"));
757 else if (argc == 1)
3706ed29
TRC
758 rename_branch(head, argv[0], rename > 1);
759 else if (argc == 2)
760 rename_branch(argv[0], argv[1], rename > 1);
761 else
43722c4d 762 die(_("too many branches for a rename operation"));
6183d826
CMN
763 } else if (new_upstream) {
764 struct branch *branch = branch_get(argv[0]);
765
8efb8899
NTND
766 if (argc > 1)
767 die(_("too many branches to set new upstream"));
768
769 if (!branch) {
770 if (!argc || !strcmp(argv[0], "HEAD"))
771 die(_("could not set upstream of HEAD to %s when "
772 "it does not point to any branch."),
773 new_upstream);
774 die(_("no such branch '%s'"), argv[0]);
775 }
776
6183d826
CMN
777 if (!ref_exists(branch->refname))
778 die(_("branch '%s' does not exist"), branch->name);
779
780 /*
781 * create_branch takes care of setting up the tracking
782 * info and making sure new_upstream is correct
783 */
784 create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
b84869ef
CMN
785 } else if (unset_upstream) {
786 struct branch *branch = branch_get(argv[0]);
787 struct strbuf buf = STRBUF_INIT;
788
8efb8899
NTND
789 if (argc > 1)
790 die(_("too many branches to unset upstream"));
791
792 if (!branch) {
793 if (!argc || !strcmp(argv[0], "HEAD"))
794 die(_("could not unset upstream of HEAD when "
795 "it does not point to any branch."));
796 die(_("no such branch '%s'"), argv[0]);
797 }
798
54d07f2e 799 if (!branch_has_merge_config(branch))
b84869ef 800 die(_("Branch '%s' has no upstream information"), branch->name);
b84869ef
CMN
801
802 strbuf_addf(&buf, "branch.%s.remote", branch->name);
3d180648 803 git_config_set_multivar(buf.buf, NULL, NULL, 1);
b84869ef
CMN
804 strbuf_reset(&buf);
805 strbuf_addf(&buf, "branch.%s.merge", branch->name);
3d180648 806 git_config_set_multivar(buf.buf, NULL, NULL, 1);
b84869ef 807 strbuf_release(&buf);
5cd75c7d 808 } else if (argc > 0 && argc <= 2) {
b347d06b
CMN
809 struct branch *branch = branch_get(argv[0]);
810 int branch_existed = 0, remote_tracking = 0;
811 struct strbuf buf = STRBUF_INIT;
812
8efb8899
NTND
813 if (!strcmp(argv[0], "HEAD"))
814 die(_("it does not make sense to create 'HEAD' manually"));
815
816 if (!branch)
817 die(_("no such branch '%s'"), argv[0]);
818
1511b22d 819 if (filter.kind != FILTER_REFS_BRANCHES)
49df4b02 820 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
b347d06b
CMN
821
822 if (track == BRANCH_TRACK_OVERRIDE)
823 fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
824
825 strbuf_addf(&buf, "refs/remotes/%s", branch->name);
826 remote_tracking = ref_exists(buf.buf);
827 strbuf_release(&buf);
828
829 branch_existed = ref_exists(branch->refname);
e496c003 830 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
356e91f2 831 force, reflog, 0, quiet, track);
b347d06b
CMN
832
833 /*
834 * We only show the instructions if the user gave us
835 * one branch which doesn't exist locally, but is the
836 * name of a remote-tracking branch.
837 */
838 if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
839 !branch_existed && remote_tracking) {
840 fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
841 fprintf(stderr, _(" git branch -d %s\n"), branch->name);
842 fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name);
843 }
844
6e8f993a 845 } else
a8dfd5ea 846 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
847
848 return 0;
849}