git_config_colorbool: refactor stdout_is_tty handling
[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"
a8dfd5ea
PH
18
19static const char * const builtin_branch_usage[] = {
1b1dd23f
SB
20 "git branch [options] [-r | -a] [--merged | --no-merged]",
21 "git branch [options] [-l] [-f] <branchname> [<start-point>]",
534cea3f 22 "git branch [options] [-r] (-d | -D) <branchname>...",
1b1dd23f 23 "git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
a8dfd5ea
PH
24 NULL
25};
c31820c2 26
f3d985c3
JH
27#define REF_LOCAL_BRANCH 0x01
28#define REF_REMOTE_BRANCH 0x02
c31820c2
LH
29
30static const char *head;
31static unsigned char head_sha1[20];
32
6b2f2d98 33static int branch_use_color = -1;
a1158cae 34static char branch_colors[][COLOR_MAXLEN] = {
dc6ebd4c
AL
35 GIT_COLOR_RESET,
36 GIT_COLOR_NORMAL, /* PLAIN */
37 GIT_COLOR_RED, /* REMOTE */
38 GIT_COLOR_NORMAL, /* LOCAL */
39 GIT_COLOR_GREEN, /* CURRENT */
a1158cae
AP
40};
41enum color_branch {
74bb2dfb
AL
42 BRANCH_COLOR_RESET = 0,
43 BRANCH_COLOR_PLAIN = 1,
44 BRANCH_COLOR_REMOTE = 2,
45 BRANCH_COLOR_LOCAL = 3,
4b05548f 46 BRANCH_COLOR_CURRENT = 4
a1158cae
AP
47};
48
049716b3
JH
49static enum merge_filter {
50 NO_FILTER = 0,
51 SHOW_NOT_MERGED,
4b05548f 52 SHOW_MERGED
049716b3
JH
53} merge_filter;
54static unsigned char merge_filter_ref[20];
e8b404c2 55
a1158cae
AP
56static int parse_branch_color_slot(const char *var, int ofs)
57{
58 if (!strcasecmp(var+ofs, "plain"))
74bb2dfb 59 return BRANCH_COLOR_PLAIN;
a1158cae 60 if (!strcasecmp(var+ofs, "reset"))
74bb2dfb 61 return BRANCH_COLOR_RESET;
a1158cae 62 if (!strcasecmp(var+ofs, "remote"))
74bb2dfb 63 return BRANCH_COLOR_REMOTE;
a1158cae 64 if (!strcasecmp(var+ofs, "local"))
74bb2dfb 65 return BRANCH_COLOR_LOCAL;
a1158cae 66 if (!strcasecmp(var+ofs, "current"))
74bb2dfb 67 return BRANCH_COLOR_CURRENT;
8b8e8624 68 return -1;
a1158cae
AP
69}
70
ef90d6d4 71static int git_branch_config(const char *var, const char *value, void *cb)
a1158cae
AP
72{
73 if (!strcmp(var, "color.branch")) {
e269eb79 74 branch_use_color = git_config_colorbool(var, value);
a1158cae
AP
75 return 0;
76 }
cc44c765 77 if (!prefixcmp(var, "color.branch.")) {
a1158cae 78 int slot = parse_branch_color_slot(var, 13);
8b8e8624
JK
79 if (slot < 0)
80 return 0;
5768c98a
JH
81 if (!value)
82 return config_error_nonbool(var);
a1158cae
AP
83 color_parse(value, var, branch_colors[slot]);
84 return 0;
85 }
ef90d6d4 86 return git_color_default_config(var, value, cb);
a1158cae
AP
87}
88
52fae7de 89static const char *branch_get_color(enum color_branch ix)
a1158cae 90{
6b2f2d98 91 if (branch_use_color > 0)
a1158cae
AP
92 return branch_colors[ix];
93 return "";
94}
95
99c419c9
JH
96static int branch_merged(int kind, const char *name,
97 struct commit *rev, struct commit *head_rev)
98{
99 /*
100 * This checks whether the merge bases of branch and HEAD (or
101 * the other branch this branch builds upon) contains the
102 * branch, which means that the branch has already been merged
103 * safely to HEAD (or the other branch).
104 */
105 struct commit *reference_rev = NULL;
106 const char *reference_name = NULL;
107 int merged;
108
109 if (kind == REF_LOCAL_BRANCH) {
110 struct branch *branch = branch_get(name);
111 unsigned char sha1[20];
112
113 if (branch &&
114 branch->merge &&
115 branch->merge[0] &&
116 branch->merge[0]->dst &&
117 (reference_name =
118 resolve_ref(branch->merge[0]->dst, sha1, 1, NULL)) != NULL)
119 reference_rev = lookup_commit_reference(sha1);
120 }
121 if (!reference_rev)
122 reference_rev = head_rev;
123
124 merged = in_merge_bases(rev, &reference_rev, 1);
125
126 /*
127 * After the safety valve is fully redefined to "check with
128 * upstream, if any, otherwise with HEAD", we should just
129 * return the result of the in_merge_bases() above without
130 * any of the following code, but during the transition period,
131 * a gentle reminder is in order.
132 */
133 if ((head_rev != reference_rev) &&
134 in_merge_bases(rev, &head_rev, 1) != merged) {
135 if (merged)
49df4b02 136 warning(_("deleting branch '%s' that has been merged to\n"
6c80cd29 137 " '%s', but not yet merged to HEAD."),
99c419c9
JH
138 name, reference_name);
139 else
49df4b02
ÆAB
140 warning(_("not deleting branch '%s' that is not yet merged to\n"
141 " '%s', even though it is merged to HEAD."),
99c419c9
JH
142 name, reference_name);
143 }
144 return merged;
145}
146
b8e9a00d 147static int delete_branches(int argc, const char **argv, int force, int kinds)
c31820c2 148{
99c419c9 149 struct commit *rev, *head_rev = NULL;
c31820c2 150 unsigned char sha1[20];
b8e9a00d 151 char *name = NULL;
f3d985c3 152 const char *fmt, *remote;
c31820c2 153 int i;
b8e9a00d 154 int ret = 0;
8415d5c7 155 struct strbuf bname = STRBUF_INIT;
c31820c2 156
f3d985c3
JH
157 switch (kinds) {
158 case REF_REMOTE_BRANCH:
159 fmt = "refs/remotes/%s";
2852e1dd
ÆAB
160 /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */
161 remote = _("remote ");
f3d985c3
JH
162 force = 1;
163 break;
164 case REF_LOCAL_BRANCH:
165 fmt = "refs/heads/%s";
166 remote = "";
167 break;
168 default:
49df4b02 169 die(_("cannot use -a with -d"));
f3d985c3 170 }
c31820c2 171
67affd51
JH
172 if (!force) {
173 head_rev = lookup_commit_reference(head_sha1);
174 if (!head_rev)
49df4b02 175 die(_("Couldn't look up commit object for HEAD"));
67affd51 176 }
8415d5c7 177 for (i = 0; i < argc; i++, strbuf_release(&bname)) {
a552de75 178 strbuf_branchname(&bname, argv[i]);
8415d5c7 179 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
49df4b02
ÆAB
180 error(_("Cannot delete the branch '%s' "
181 "which you are currently on."), bname.buf);
b8e9a00d
QT
182 ret = 1;
183 continue;
184 }
185
8e0f7003 186 free(name);
c31820c2 187
8415d5c7 188 name = xstrdup(mkpath(fmt, bname.buf));
b8e9a00d 189 if (!resolve_ref(name, sha1, 1, NULL)) {
49df4b02 190 error(_("%sbranch '%s' not found."),
8415d5c7 191 remote, bname.buf);
b8e9a00d
QT
192 ret = 1;
193 continue;
194 }
c31820c2
LH
195
196 rev = lookup_commit_reference(sha1);
b8e9a00d 197 if (!rev) {
49df4b02 198 error(_("Couldn't look up commit object for '%s'"), name);
b8e9a00d
QT
199 ret = 1;
200 continue;
201 }
c31820c2 202
99c419c9 203 if (!force && !branch_merged(kinds, bname.buf, rev, head_rev)) {
49df4b02 204 error(_("The branch '%s' is not fully merged.\n"
8415d5c7 205 "If you are sure you want to delete it, "
49df4b02 206 "run 'git branch -D %s'."), bname.buf, bname.buf);
b8e9a00d
QT
207 ret = 1;
208 continue;
c31820c2
LH
209 }
210
eca35a25 211 if (delete_ref(name, sha1, 0)) {
49df4b02 212 error(_("Error deleting %sbranch '%s'"), remote,
8415d5c7 213 bname.buf);
b8e9a00d 214 ret = 1;
f1eccbab 215 } else {
3c59c50d 216 struct strbuf buf = STRBUF_INIT;
8af42b0f 217 printf(_("Deleted %sbranch %s (was %s).\n"), remote,
8415d5c7
JH
218 bname.buf,
219 find_unique_abbrev(sha1, DEFAULT_ABBREV));
220 strbuf_addf(&buf, "branch.%s", bname.buf);
3c59c50d 221 if (git_config_rename_section(buf.buf, NULL) < 0)
49df4b02 222 warning(_("Update of config-file failed"));
3c59c50d 223 strbuf_release(&buf);
f1eccbab 224 }
c31820c2 225 }
c31820c2 226
8e0f7003 227 free(name);
b8e9a00d
QT
228
229 return(ret);
c31820c2 230}
c31820c2 231
bfcc9214
AP
232struct ref_item {
233 char *name;
209d336a
JS
234 char *dest;
235 unsigned int kind, len;
68067ca1 236 struct commit *commit;
bfcc9214
AP
237};
238
239struct ref_list {
68067ca1 240 struct rev_info revs;
7e9ff00b 241 int index, alloc, maxwidth, verbose, abbrev;
bfcc9214 242 struct ref_item *list;
694a5775 243 struct commit_list *with_commit;
bfcc9214
AP
244 int kinds;
245};
246
209d336a
JS
247static char *resolve_symref(const char *src, const char *prefix)
248{
249 unsigned char sha1[20];
250 int flag;
251 const char *dst, *cp;
252
253 dst = resolve_ref(src, sha1, 0, &flag);
254 if (!(dst && (flag & REF_ISSYMREF)))
255 return NULL;
256 if (prefix && (cp = skip_prefix(dst, prefix)))
257 dst = cp;
258 return xstrdup(dst);
259}
260
1603ade8
SM
261struct append_ref_cb {
262 struct ref_list *ref_list;
263 int ret;
264};
265
bfcc9214 266static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
c31820c2 267{
1603ade8
SM
268 struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
269 struct ref_list *ref_list = cb->ref_list;
bfcc9214 270 struct ref_item *newitem;
68067ca1 271 struct commit *commit;
209d336a
JS
272 int kind, i;
273 const char *prefix, *orig_refname = refname;
274
275 static struct {
276 int kind;
277 const char *prefix;
278 int pfxlen;
279 } ref_kind[] = {
280 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
281 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
282 };
bfcc9214
AP
283
284 /* Detect kind */
209d336a
JS
285 for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
286 prefix = ref_kind[i].prefix;
287 if (strncmp(refname, prefix, ref_kind[i].pfxlen))
288 continue;
289 kind = ref_kind[i].kind;
290 refname += ref_kind[i].pfxlen;
291 break;
292 }
293 if (ARRAY_SIZE(ref_kind) <= i)
0f31d680 294 return 0;
bfcc9214
AP
295
296 /* Don't add types the caller doesn't want */
297 if ((kind & ref_list->kinds) == 0)
298 return 0;
299
191d1ac4
LT
300 commit = NULL;
301 if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
302 commit = lookup_commit_reference_gently(sha1, 1);
1603ade8 303 if (!commit) {
49df4b02 304 cb->ret = error(_("branch '%s' does not point at a commit"), refname);
0e9716e6 305 return 0;
1603ade8 306 }
68067ca1 307
191d1ac4
LT
308 /* Filter with with_commit if specified */
309 if (!is_descendant_of(commit, ref_list->with_commit))
310 return 0;
694a5775 311
191d1ac4
LT
312 if (merge_filter != NO_FILTER)
313 add_pending_object(&ref_list->revs,
314 (struct object *)commit, refname);
315 }
e8b404c2 316
fcbc0d8e 317 ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc);
c31820c2 318
bfcc9214
AP
319 /* Record the new item */
320 newitem = &(ref_list->list[ref_list->index++]);
321 newitem->name = xstrdup(refname);
322 newitem->kind = kind;
68067ca1 323 newitem->commit = commit;
209d336a
JS
324 newitem->len = strlen(refname);
325 newitem->dest = resolve_symref(orig_refname, prefix);
326 /* adjust for "remotes/" */
327 if (newitem->kind == REF_REMOTE_BRANCH &&
328 ref_list->kinds != REF_REMOTE_BRANCH)
329 newitem->len += 8;
330 if (newitem->len > ref_list->maxwidth)
331 ref_list->maxwidth = newitem->len;
c31820c2
LH
332
333 return 0;
334}
335
bfcc9214
AP
336static void free_ref_list(struct ref_list *ref_list)
337{
338 int i;
339
209d336a 340 for (i = 0; i < ref_list->index; i++) {
bfcc9214 341 free(ref_list->list[i].name);
209d336a
JS
342 free(ref_list->list[i].dest);
343 }
bfcc9214
AP
344 free(ref_list->list);
345}
346
c31820c2
LH
347static int ref_cmp(const void *r1, const void *r2)
348{
bfcc9214
AP
349 struct ref_item *c1 = (struct ref_item *)(r1);
350 struct ref_item *c2 = (struct ref_item *)(r2);
351
352 if (c1->kind != c2->kind)
353 return c1->kind - c2->kind;
354 return strcmp(c1->name, c2->name);
c31820c2
LH
355}
356
2d8a7f0b
JK
357static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
358 int show_upstream_ref)
94fcb730
JH
359{
360 int ours, theirs;
361 struct branch *branch = branch_get(branch_name);
362
2d8a7f0b
JK
363 if (!stat_tracking_info(branch, &ours, &theirs)) {
364 if (branch && branch->merge && branch->merge[0]->dst &&
365 show_upstream_ref)
366 strbuf_addf(stat, "[%s] ",
6e7b3309 367 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
94fcb730 368 return;
2d8a7f0b
JK
369 }
370
371 strbuf_addch(stat, '[');
372 if (show_upstream_ref)
373 strbuf_addf(stat, "%s: ",
6e7b3309 374 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
94fcb730 375 if (!ours)
a5760906 376 strbuf_addf(stat, _("behind %d] "), theirs);
94fcb730 377 else if (!theirs)
a5760906 378 strbuf_addf(stat, _("ahead %d] "), ours);
94fcb730 379 else
a5760906 380 strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
94fcb730
JH
381}
382
7950cda7
LH
383static int matches_merge_filter(struct commit *commit)
384{
385 int is_merged;
386
387 if (merge_filter == NO_FILTER)
388 return 1;
389
390 is_merged = !!(commit->object.flags & UNINTERESTING);
391 return (is_merged == (merge_filter == SHOW_MERGED));
392}
393
6e0332ec
JN
394static void add_verbose_info(struct strbuf *out, struct ref_item *item,
395 int verbose, int abbrev)
396{
397 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
398 const char *sub = " **** invalid ref ****";
399 struct commit *commit = item->commit;
400
401 if (commit && !parse_commit(commit)) {
f67d2e82 402 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
6e0332ec
JN
403 sub = subject.buf;
404 }
405
406 if (item->kind == REF_LOCAL_BRANCH)
407 fill_tracking_info(&stat, item->name, verbose > 1);
408
409 strbuf_addf(out, " %s %s%s",
410 find_unique_abbrev(item->commit->object.sha1, abbrev),
411 stat.buf, sub);
412 strbuf_release(&stat);
413 strbuf_release(&subject);
414}
415
af0e4ac0 416static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
209d336a 417 int abbrev, int current, char *prefix)
75e6e213 418{
af0e4ac0
LH
419 char c;
420 int color;
68067ca1 421 struct commit *commit = item->commit;
209d336a 422 struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
68067ca1 423
7950cda7
LH
424 if (!matches_merge_filter(commit))
425 return;
75e6e213 426
af0e4ac0
LH
427 switch (item->kind) {
428 case REF_LOCAL_BRANCH:
74bb2dfb 429 color = BRANCH_COLOR_LOCAL;
af0e4ac0
LH
430 break;
431 case REF_REMOTE_BRANCH:
74bb2dfb 432 color = BRANCH_COLOR_REMOTE;
af0e4ac0
LH
433 break;
434 default:
74bb2dfb 435 color = BRANCH_COLOR_PLAIN;
af0e4ac0
LH
436 break;
437 }
75e6e213 438
af0e4ac0
LH
439 c = ' ';
440 if (current) {
441 c = '*';
74bb2dfb 442 color = BRANCH_COLOR_CURRENT;
af0e4ac0 443 }
75e6e213 444
209d336a
JS
445 strbuf_addf(&name, "%s%s", prefix, item->name);
446 if (verbose)
447 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
448 maxwidth, name.buf,
81474267 449 branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
450 else
451 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
81474267 452 name.buf, branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
453
454 if (item->dest)
455 strbuf_addf(&out, " -> %s", item->dest);
6e0332ec
JN
456 else if (verbose)
457 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
458 add_verbose_info(&out, item, verbose, abbrev);
209d336a
JS
459 printf("%s\n", out.buf);
460 strbuf_release(&name);
461 strbuf_release(&out);
75e6e213
LH
462}
463
b6f637d1
LH
464static int calc_maxwidth(struct ref_list *refs)
465{
209d336a 466 int i, w = 0;
b6f637d1
LH
467 for (i = 0; i < refs->index; i++) {
468 if (!matches_merge_filter(refs->list[i].commit))
469 continue;
209d336a
JS
470 if (refs->list[i].len > w)
471 w = refs->list[i].len;
b6f637d1
LH
472 }
473 return w;
474}
475
7e9ff00b
LT
476
477static void show_detached(struct ref_list *ref_list)
478{
479 struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
480
481 if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
482 struct ref_item item;
409fa556 483 item.name = xstrdup(_("(no branch)"));
7e9ff00b
LT
484 item.len = strlen(item.name);
485 item.kind = REF_LOCAL_BRANCH;
486 item.dest = NULL;
487 item.commit = head_commit;
488 if (item.len > ref_list->maxwidth)
489 ref_list->maxwidth = item.len;
490 print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, "");
491 free(item.name);
492 }
493}
494
1603ade8 495static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
c31820c2
LH
496{
497 int i;
1603ade8 498 struct append_ref_cb cb;
bfcc9214 499 struct ref_list ref_list;
c31820c2 500
bfcc9214
AP
501 memset(&ref_list, 0, sizeof(ref_list));
502 ref_list.kinds = kinds;
191d1ac4 503 ref_list.verbose = verbose;
7e9ff00b 504 ref_list.abbrev = abbrev;
694a5775 505 ref_list.with_commit = with_commit;
68067ca1
JH
506 if (merge_filter != NO_FILTER)
507 init_revisions(&ref_list.revs, NULL);
1603ade8
SM
508 cb.ref_list = &ref_list;
509 cb.ret = 0;
510 for_each_rawref(append_ref, &cb);
68067ca1
JH
511 if (merge_filter != NO_FILTER) {
512 struct commit *filter;
513 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
514 filter->object.flags |= UNINTERESTING;
515 add_pending_object(&ref_list.revs,
516 (struct object *) filter, "");
517 ref_list.revs.limited = 1;
518 prepare_revision_walk(&ref_list.revs);
b6f637d1
LH
519 if (verbose)
520 ref_list.maxwidth = calc_maxwidth(&ref_list);
68067ca1 521 }
c31820c2 522
bfcc9214 523 qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
c31820c2 524
0016a482 525 detached = (detached && (kinds & REF_LOCAL_BRANCH));
7e9ff00b
LT
526 if (detached)
527 show_detached(&ref_list);
0016a482 528
bfcc9214 529 for (i = 0; i < ref_list.index; i++) {
0016a482
LH
530 int current = !detached &&
531 (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
af0e4ac0 532 !strcmp(ref_list.list[i].name, head);
209d336a
JS
533 char *prefix = (kinds != REF_REMOTE_BRANCH &&
534 ref_list.list[i].kind == REF_REMOTE_BRANCH)
535 ? "remotes/" : "";
af0e4ac0 536 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
209d336a 537 abbrev, current, prefix);
c31820c2 538 }
bfcc9214
AP
539
540 free_ref_list(&ref_list);
1603ade8 541
0e9716e6 542 if (cb.ret)
49df4b02 543 error(_("some refs could not be read"));
0e9716e6 544
1603ade8 545 return cb.ret;
c31820c2
LH
546}
547
c976d415
LH
548static void rename_branch(const char *oldname, const char *newname, int force)
549{
da3f78a2 550 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
c976d415 551 unsigned char sha1[20];
da3f78a2 552 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
cbdffe40 553 int recovery = 0;
c976d415 554
c847f537 555 if (!oldname)
49df4b02 556 die(_("cannot rename the current branch while not on any."));
c847f537 557
cbdffe40
JH
558 if (strbuf_check_branch_ref(&oldref, oldname)) {
559 /*
560 * Bad name --- this could be an attempt to rename a
561 * ref that we used to allow to be created by accident.
562 */
563 if (resolve_ref(oldref.buf, sha1, 1, NULL))
564 recovery = 1;
565 else
49df4b02 566 die(_("Invalid branch name: '%s'"), oldname);
cbdffe40 567 }
c976d415 568
a2fab531 569 if (strbuf_check_branch_ref(&newref, newname))
49df4b02 570 die(_("Invalid branch name: '%s'"), newname);
c976d415 571
da3f78a2 572 if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
49df4b02 573 die(_("A branch named '%s' already exists."), newref.buf + 11);
c976d415 574
da3f78a2
MV
575 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
576 oldref.buf, newref.buf);
678d0f4c 577
da3f78a2 578 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
49df4b02 579 die(_("Branch rename failed"));
da3f78a2 580 strbuf_release(&logmsg);
c976d415 581
cbdffe40 582 if (recovery)
49df4b02 583 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
cbdffe40 584
8b5157e4 585 /* no need to pass logmsg here as HEAD didn't really move */
da3f78a2 586 if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
49df4b02 587 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
19eba151 588
da3f78a2
MV
589 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
590 strbuf_release(&oldref);
591 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
592 strbuf_release(&newref);
593 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
49df4b02 594 die(_("Branch is renamed, but update of config-file failed"));
da3f78a2
MV
595 strbuf_release(&oldsection);
596 strbuf_release(&newsection);
c976d415
LH
597}
598
049716b3
JH
599static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
600{
601 merge_filter = ((opt->long_name[0] == 'n')
602 ? SHOW_NOT_MERGED
603 : SHOW_MERGED);
604 if (unset)
605 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
606 if (!arg)
607 arg = "HEAD";
608 if (get_sha1(arg, merge_filter_ref))
49df4b02 609 die(_("malformed object name %s"), arg);
049716b3
JH
610 return 0;
611}
612
c31820c2
LH
613int cmd_branch(int argc, const char **argv, const char *prefix)
614{
d11d44fa 615 int delete = 0, rename = 0, force_create = 0;
0016a482 616 int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
9ed36cfa
JS
617 int reflog = 0;
618 enum branch_track track;
d11d44fa 619 int kinds = REF_LOCAL_BRANCH;
694a5775 620 struct commit_list *with_commit = NULL;
a8dfd5ea
PH
621
622 struct option options[] = {
623 OPT_GROUP("Generic options"),
39271425
RS
624 OPT__VERBOSE(&verbose,
625 "show hash and subject, give twice for upstream branch"),
be427d75 626 OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))",
9ed36cfa 627 BRANCH_TRACK_EXPLICIT),
4fc50066
IL
628 OPT_SET_INT( 0, "set-upstream", &track, "change upstream info",
629 BRANCH_TRACK_OVERRIDE),
73e9da01 630 OPT__COLOR(&branch_use_color, "use colored output"),
d11d44fa
PH
631 OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
632 REF_REMOTE_BRANCH),
e84fb2ff
JH
633 {
634 OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
635 "print only branches that contain the commit",
636 PARSE_OPT_LASTARG_DEFAULT,
269defdf 637 parse_opt_with_commit, (intptr_t)"HEAD",
e84fb2ff 638 },
694a5775
JH
639 {
640 OPTION_CALLBACK, 0, "with", &with_commit, "commit",
641 "print only branches that contain the commit",
e84fb2ff 642 PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
269defdf 643 parse_opt_with_commit, (intptr_t) "HEAD",
694a5775 644 },
a8dfd5ea
PH
645 OPT__ABBREV(&abbrev),
646
647 OPT_GROUP("Specific git-branch actions:"),
d11d44fa
PH
648 OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
649 REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
650 OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
651 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
652 OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
653 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
654 OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
76946b76 655 OPT__FORCE(&force_create, "force creation (when already exists)"),
049716b3
JH
656 {
657 OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
658 "commit", "print only not merged branches",
659 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
660 opt_parse_merge_filter, (intptr_t) "HEAD",
661 },
662 {
663 OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
664 "commit", "print only merged branches",
665 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
666 opt_parse_merge_filter, (intptr_t) "HEAD",
667 },
a8dfd5ea
PH
668 OPT_END(),
669 };
c31820c2 670
1dacfbcf
NTND
671 if (argc == 2 && !strcmp(argv[1], "-h"))
672 usage_with_options(builtin_branch_usage, options);
673
ef90d6d4 674 git_config(git_branch_config, NULL);
6b2f2d98
MK
675
676 if (branch_use_color == -1)
677 branch_use_color = git_use_color_default;
678
9ed36cfa 679 track = git_branch_track;
c976d415 680
078f8380 681 head = resolve_ref("HEAD", head_sha1, 0, NULL);
c31820c2 682 if (!head)
49df4b02 683 die(_("Failed to resolve HEAD as a valid ref."));
078f8380 684 head = xstrdup(head);
0016a482
LH
685 if (!strcmp(head, "HEAD")) {
686 detached = 1;
a8dfd5ea 687 } else {
cc44c765 688 if (prefixcmp(head, "refs/heads/"))
49df4b02 689 die(_("HEAD not found below refs/heads!"));
0016a482
LH
690 head += 11;
691 }
049716b3
JH
692 hashcpy(merge_filter_ref, head_sha1);
693
37782920
SB
694 argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
695 0);
049716b3
JH
696 if (!!delete + !!rename + !!force_create > 1)
697 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
698
699 if (delete)
d11d44fa 700 return delete_branches(argc, argv, delete > 1, kinds);
a8dfd5ea 701 else if (argc == 0)
1603ade8 702 return print_ref_list(kinds, detached, verbose, abbrev, with_commit);
a8dfd5ea 703 else if (rename && (argc == 1))
d11d44fa 704 rename_branch(head, argv[0], rename > 1);
a8dfd5ea 705 else if (rename && (argc == 2))
d11d44fa 706 rename_branch(argv[0], argv[1], rename > 1);
6e8f993a
MM
707 else if (argc <= 2) {
708 if (kinds != REF_LOCAL_BRANCH)
49df4b02 709 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
e496c003 710 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
45994a1e 711 force_create, reflog, track);
6e8f993a 712 } else
a8dfd5ea 713 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
714
715 return 0;
716}