branch: let branch filters imply --list
[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"
a8dfd5ea
PH
21
22static const char * const builtin_branch_usage[] = {
24a85214
NTND
23 N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
24 N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
25 N_("git branch [options] [-r] (-d | -D) <branchname>..."),
26 N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
a8dfd5ea
PH
27 NULL
28};
c31820c2 29
f3d985c3
JH
30#define REF_LOCAL_BRANCH 0x01
31#define REF_REMOTE_BRANCH 0x02
c31820c2
LH
32
33static const char *head;
34static unsigned char head_sha1[20];
35
6b2f2d98 36static int branch_use_color = -1;
a1158cae 37static char branch_colors[][COLOR_MAXLEN] = {
dc6ebd4c
AL
38 GIT_COLOR_RESET,
39 GIT_COLOR_NORMAL, /* PLAIN */
40 GIT_COLOR_RED, /* REMOTE */
41 GIT_COLOR_NORMAL, /* LOCAL */
42 GIT_COLOR_GREEN, /* CURRENT */
a1158cae
AP
43};
44enum color_branch {
74bb2dfb
AL
45 BRANCH_COLOR_RESET = 0,
46 BRANCH_COLOR_PLAIN = 1,
47 BRANCH_COLOR_REMOTE = 2,
48 BRANCH_COLOR_LOCAL = 3,
4b05548f 49 BRANCH_COLOR_CURRENT = 4
a1158cae
AP
50};
51
049716b3
JH
52static enum merge_filter {
53 NO_FILTER = 0,
54 SHOW_NOT_MERGED,
4b05548f 55 SHOW_MERGED
049716b3
JH
56} merge_filter;
57static unsigned char merge_filter_ref[20];
e8b404c2 58
ebe31ef2
NTND
59static struct string_list output = STRING_LIST_INIT_DUP;
60static unsigned int colopts;
61
a1158cae
AP
62static int parse_branch_color_slot(const char *var, int ofs)
63{
64 if (!strcasecmp(var+ofs, "plain"))
74bb2dfb 65 return BRANCH_COLOR_PLAIN;
a1158cae 66 if (!strcasecmp(var+ofs, "reset"))
74bb2dfb 67 return BRANCH_COLOR_RESET;
a1158cae 68 if (!strcasecmp(var+ofs, "remote"))
74bb2dfb 69 return BRANCH_COLOR_REMOTE;
a1158cae 70 if (!strcasecmp(var+ofs, "local"))
74bb2dfb 71 return BRANCH_COLOR_LOCAL;
a1158cae 72 if (!strcasecmp(var+ofs, "current"))
74bb2dfb 73 return BRANCH_COLOR_CURRENT;
8b8e8624 74 return -1;
a1158cae
AP
75}
76
ef90d6d4 77static int git_branch_config(const char *var, const char *value, void *cb)
a1158cae 78{
ebe31ef2
NTND
79 if (!prefixcmp(var, "column."))
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 }
cc44c765 85 if (!prefixcmp(var, "color.branch.")) {
a1158cae 86 int slot = parse_branch_color_slot(var, 13);
8b8e8624
JK
87 if (slot < 0)
88 return 0;
5768c98a
JH
89 if (!value)
90 return config_error_nonbool(var);
a1158cae
AP
91 color_parse(value, var, branch_colors[slot]);
92 return 0;
93 }
ef90d6d4 94 return git_color_default_config(var, value, cb);
a1158cae
AP
95}
96
52fae7de 97static const char *branch_get_color(enum color_branch ix)
a1158cae 98{
daa0c3d9 99 if (want_color(branch_use_color))
a1158cae
AP
100 return branch_colors[ix];
101 return "";
102}
103
99c419c9
JH
104static int branch_merged(int kind, const char *name,
105 struct commit *rev, struct commit *head_rev)
106{
107 /*
108 * This checks whether the merge bases of branch and HEAD (or
109 * the other branch this branch builds upon) contains the
110 * branch, which means that the branch has already been merged
111 * safely to HEAD (or the other branch).
112 */
113 struct commit *reference_rev = NULL;
114 const char *reference_name = NULL;
96ec7b1e 115 void *reference_name_to_free = NULL;
99c419c9
JH
116 int merged;
117
118 if (kind == REF_LOCAL_BRANCH) {
119 struct branch *branch = branch_get(name);
120 unsigned char sha1[20];
121
122 if (branch &&
123 branch->merge &&
124 branch->merge[0] &&
125 branch->merge[0]->dst &&
96ec7b1e
NTND
126 (reference_name = reference_name_to_free =
127 resolve_refdup(branch->merge[0]->dst, sha1, 1, NULL)) != NULL)
99c419c9
JH
128 reference_rev = lookup_commit_reference(sha1);
129 }
130 if (!reference_rev)
131 reference_rev = head_rev;
132
a20efee9 133 merged = in_merge_bases(rev, reference_rev);
99c419c9
JH
134
135 /*
136 * After the safety valve is fully redefined to "check with
137 * upstream, if any, otherwise with HEAD", we should just
138 * return the result of the in_merge_bases() above without
139 * any of the following code, but during the transition period,
140 * a gentle reminder is in order.
141 */
142 if ((head_rev != reference_rev) &&
a20efee9 143 in_merge_bases(rev, head_rev) != merged) {
99c419c9 144 if (merged)
49df4b02 145 warning(_("deleting branch '%s' that has been merged to\n"
6c80cd29 146 " '%s', but not yet merged to HEAD."),
99c419c9
JH
147 name, reference_name);
148 else
49df4b02
ÆAB
149 warning(_("not deleting branch '%s' that is not yet merged to\n"
150 " '%s', even though it is merged to HEAD."),
99c419c9
JH
151 name, reference_name);
152 }
96ec7b1e 153 free(reference_name_to_free);
99c419c9
JH
154 return merged;
155}
156
f5d0e162
RS
157static int check_branch_commit(const char *branchname, const char *refname,
158 unsigned char *sha1, struct commit *head_rev,
159 int kinds, int force)
160{
161 struct commit *rev = lookup_commit_reference(sha1);
162 if (!rev) {
163 error(_("Couldn't look up commit object for '%s'"), refname);
164 return -1;
165 }
166 if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
167 error(_("The branch '%s' is not fully merged.\n"
168 "If you are sure you want to delete it, "
169 "run 'git branch -D %s'."), branchname, branchname);
170 return -1;
171 }
172 return 0;
173}
174
22ed7927
RS
175static void delete_branch_config(const char *branchname)
176{
177 struct strbuf buf = STRBUF_INIT;
178 strbuf_addf(&buf, "branch.%s", branchname);
179 if (git_config_rename_section(buf.buf, NULL) < 0)
180 warning(_("Update of config-file failed"));
181 strbuf_release(&buf);
182}
183
d65ddf19
JK
184static int delete_branches(int argc, const char **argv, int force, int kinds,
185 int quiet)
c31820c2 186{
f5d0e162 187 struct commit *head_rev = NULL;
c31820c2 188 unsigned char sha1[20];
b8e9a00d 189 char *name = NULL;
c179837c 190 const char *fmt;
c31820c2 191 int i;
b8e9a00d 192 int ret = 0;
c179837c 193 int remote_branch = 0;
8415d5c7 194 struct strbuf bname = STRBUF_INIT;
c31820c2 195
f3d985c3
JH
196 switch (kinds) {
197 case REF_REMOTE_BRANCH:
198 fmt = "refs/remotes/%s";
c179837c
ÆAB
199 /* For subsequent UI messages */
200 remote_branch = 1;
201
f3d985c3
JH
202 force = 1;
203 break;
204 case REF_LOCAL_BRANCH:
205 fmt = "refs/heads/%s";
f3d985c3
JH
206 break;
207 default:
49df4b02 208 die(_("cannot use -a with -d"));
f3d985c3 209 }
c31820c2 210
67affd51
JH
211 if (!force) {
212 head_rev = lookup_commit_reference(head_sha1);
213 if (!head_rev)
49df4b02 214 die(_("Couldn't look up commit object for HEAD"));
67affd51 215 }
8415d5c7 216 for (i = 0; i < argc; i++, strbuf_release(&bname)) {
0fe700e3
RS
217 const char *target;
218 int flags = 0;
219
a552de75 220 strbuf_branchname(&bname, argv[i]);
8415d5c7 221 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
49df4b02
ÆAB
222 error(_("Cannot delete the branch '%s' "
223 "which you are currently on."), bname.buf);
b8e9a00d
QT
224 ret = 1;
225 continue;
226 }
227
8e0f7003 228 free(name);
c31820c2 229
4e2d094d 230 name = mkpathdup(fmt, bname.buf);
0fe700e3
RS
231 target = resolve_ref_unsafe(name, sha1, 0, &flags);
232 if (!target ||
233 (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) {
c179837c
ÆAB
234 error(remote_branch
235 ? _("remote branch '%s' not found.")
236 : _("branch '%s' not found."), bname.buf);
b8e9a00d
QT
237 ret = 1;
238 continue;
239 }
c31820c2 240
0fe700e3
RS
241 if (!(flags & REF_ISSYMREF) &&
242 check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
f5d0e162 243 force)) {
b8e9a00d
QT
244 ret = 1;
245 continue;
c31820c2
LH
246 }
247
566c7707 248 if (delete_ref(name, sha1, REF_NODEREF)) {
c179837c
ÆAB
249 error(remote_branch
250 ? _("Error deleting remote branch '%s'")
251 : _("Error deleting branch '%s'"),
8415d5c7 252 bname.buf);
b8e9a00d 253 ret = 1;
13baa9fe
RS
254 continue;
255 }
256 if (!quiet) {
257 printf(remote_branch
258 ? _("Deleted remote branch %s (was %s).\n")
259 : _("Deleted branch %s (was %s).\n"),
260 bname.buf,
261 (flags & REF_ISSYMREF)
262 ? target
263 : find_unique_abbrev(sha1, DEFAULT_ABBREV));
f1eccbab 264 }
13baa9fe 265 delete_branch_config(bname.buf);
c31820c2 266 }
c31820c2 267
8e0f7003 268 free(name);
b8e9a00d
QT
269
270 return(ret);
c31820c2 271}
c31820c2 272
bfcc9214
AP
273struct ref_item {
274 char *name;
209d336a 275 char *dest;
1452bd64 276 unsigned int kind, width;
68067ca1 277 struct commit *commit;
bfcc9214
AP
278};
279
280struct ref_list {
68067ca1 281 struct rev_info revs;
7e9ff00b 282 int index, alloc, maxwidth, verbose, abbrev;
bfcc9214 283 struct ref_item *list;
694a5775 284 struct commit_list *with_commit;
bfcc9214
AP
285 int kinds;
286};
287
209d336a
JS
288static char *resolve_symref(const char *src, const char *prefix)
289{
290 unsigned char sha1[20];
291 int flag;
292 const char *dst, *cp;
293
8cad4744 294 dst = resolve_ref_unsafe(src, sha1, 0, &flag);
209d336a
JS
295 if (!(dst && (flag & REF_ISSYMREF)))
296 return NULL;
297 if (prefix && (cp = skip_prefix(dst, prefix)))
298 dst = cp;
299 return xstrdup(dst);
300}
301
1603ade8
SM
302struct append_ref_cb {
303 struct ref_list *ref_list;
d8d33736 304 const char **pattern;
1603ade8
SM
305 int ret;
306};
307
d8d33736
MG
308static int match_patterns(const char **pattern, const char *refname)
309{
310 if (!*pattern)
311 return 1; /* no pattern always matches */
312 while (*pattern) {
313 if (!fnmatch(*pattern, refname, 0))
314 return 1;
315 pattern++;
316 }
317 return 0;
318}
319
bfcc9214 320static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
c31820c2 321{
1603ade8
SM
322 struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
323 struct ref_list *ref_list = cb->ref_list;
bfcc9214 324 struct ref_item *newitem;
68067ca1 325 struct commit *commit;
209d336a
JS
326 int kind, i;
327 const char *prefix, *orig_refname = refname;
328
329 static struct {
330 int kind;
331 const char *prefix;
332 int pfxlen;
333 } ref_kind[] = {
334 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
335 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
336 };
bfcc9214
AP
337
338 /* Detect kind */
209d336a
JS
339 for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
340 prefix = ref_kind[i].prefix;
341 if (strncmp(refname, prefix, ref_kind[i].pfxlen))
342 continue;
343 kind = ref_kind[i].kind;
344 refname += ref_kind[i].pfxlen;
345 break;
346 }
347 if (ARRAY_SIZE(ref_kind) <= i)
0f31d680 348 return 0;
bfcc9214
AP
349
350 /* Don't add types the caller doesn't want */
351 if ((kind & ref_list->kinds) == 0)
352 return 0;
353
d8d33736
MG
354 if (!match_patterns(cb->pattern, refname))
355 return 0;
356
191d1ac4
LT
357 commit = NULL;
358 if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
359 commit = lookup_commit_reference_gently(sha1, 1);
1603ade8 360 if (!commit) {
49df4b02 361 cb->ret = error(_("branch '%s' does not point at a commit"), refname);
0e9716e6 362 return 0;
1603ade8 363 }
68067ca1 364
191d1ac4
LT
365 /* Filter with with_commit if specified */
366 if (!is_descendant_of(commit, ref_list->with_commit))
367 return 0;
694a5775 368
191d1ac4
LT
369 if (merge_filter != NO_FILTER)
370 add_pending_object(&ref_list->revs,
371 (struct object *)commit, refname);
372 }
e8b404c2 373
fcbc0d8e 374 ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc);
c31820c2 375
bfcc9214
AP
376 /* Record the new item */
377 newitem = &(ref_list->list[ref_list->index++]);
378 newitem->name = xstrdup(refname);
379 newitem->kind = kind;
68067ca1 380 newitem->commit = commit;
1452bd64 381 newitem->width = utf8_strwidth(refname);
209d336a
JS
382 newitem->dest = resolve_symref(orig_refname, prefix);
383 /* adjust for "remotes/" */
384 if (newitem->kind == REF_REMOTE_BRANCH &&
385 ref_list->kinds != REF_REMOTE_BRANCH)
1452bd64
NTND
386 newitem->width += 8;
387 if (newitem->width > ref_list->maxwidth)
388 ref_list->maxwidth = newitem->width;
c31820c2
LH
389
390 return 0;
391}
392
bfcc9214
AP
393static void free_ref_list(struct ref_list *ref_list)
394{
395 int i;
396
209d336a 397 for (i = 0; i < ref_list->index; i++) {
bfcc9214 398 free(ref_list->list[i].name);
209d336a
JS
399 free(ref_list->list[i].dest);
400 }
bfcc9214
AP
401 free(ref_list->list);
402}
403
c31820c2
LH
404static int ref_cmp(const void *r1, const void *r2)
405{
bfcc9214
AP
406 struct ref_item *c1 = (struct ref_item *)(r1);
407 struct ref_item *c2 = (struct ref_item *)(r2);
408
409 if (c1->kind != c2->kind)
410 return c1->kind - c2->kind;
411 return strcmp(c1->name, c2->name);
c31820c2
LH
412}
413
2d8a7f0b
JK
414static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
415 int show_upstream_ref)
94fcb730
JH
416{
417 int ours, theirs;
21dfc09d 418 char *ref = NULL;
94fcb730
JH
419 struct branch *branch = branch_get(branch_name);
420
2d8a7f0b
JK
421 if (!stat_tracking_info(branch, &ours, &theirs)) {
422 if (branch && branch->merge && branch->merge[0]->dst &&
423 show_upstream_ref)
424 strbuf_addf(stat, "[%s] ",
6e7b3309 425 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
94fcb730 426 return;
2d8a7f0b
JK
427 }
428
2d8a7f0b 429 if (show_upstream_ref)
21dfc09d
NTND
430 ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
431 if (!ours) {
432 if (ref)
433 strbuf_addf(stat, _("[%s: behind %d]"), ref, theirs);
434 else
435 strbuf_addf(stat, _("[behind %d]"), theirs);
436
437 } else if (!theirs) {
438 if (ref)
439 strbuf_addf(stat, _("[%s: ahead %d]"), ref, ours);
440 else
441 strbuf_addf(stat, _("[ahead %d]"), ours);
442 } else {
443 if (ref)
444 strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
445 ref, ours, theirs);
446 else
447 strbuf_addf(stat, _("[ahead %d, behind %d]"),
448 ours, theirs);
449 }
450 strbuf_addch(stat, ' ');
451 free(ref);
94fcb730
JH
452}
453
7950cda7
LH
454static int matches_merge_filter(struct commit *commit)
455{
456 int is_merged;
457
458 if (merge_filter == NO_FILTER)
459 return 1;
460
461 is_merged = !!(commit->object.flags & UNINTERESTING);
462 return (is_merged == (merge_filter == SHOW_MERGED));
463}
464
6e0332ec
JN
465static void add_verbose_info(struct strbuf *out, struct ref_item *item,
466 int verbose, int abbrev)
467{
468 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
045e3884 469 const char *sub = _(" **** invalid ref ****");
6e0332ec
JN
470 struct commit *commit = item->commit;
471
472 if (commit && !parse_commit(commit)) {
f67d2e82 473 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
6e0332ec
JN
474 sub = subject.buf;
475 }
476
477 if (item->kind == REF_LOCAL_BRANCH)
478 fill_tracking_info(&stat, item->name, verbose > 1);
479
480 strbuf_addf(out, " %s %s%s",
481 find_unique_abbrev(item->commit->object.sha1, abbrev),
482 stat.buf, sub);
483 strbuf_release(&stat);
484 strbuf_release(&subject);
485}
486
af0e4ac0 487static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
209d336a 488 int abbrev, int current, char *prefix)
75e6e213 489{
af0e4ac0
LH
490 char c;
491 int color;
68067ca1 492 struct commit *commit = item->commit;
209d336a 493 struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
68067ca1 494
7950cda7
LH
495 if (!matches_merge_filter(commit))
496 return;
75e6e213 497
af0e4ac0
LH
498 switch (item->kind) {
499 case REF_LOCAL_BRANCH:
74bb2dfb 500 color = BRANCH_COLOR_LOCAL;
af0e4ac0
LH
501 break;
502 case REF_REMOTE_BRANCH:
74bb2dfb 503 color = BRANCH_COLOR_REMOTE;
af0e4ac0
LH
504 break;
505 default:
74bb2dfb 506 color = BRANCH_COLOR_PLAIN;
af0e4ac0
LH
507 break;
508 }
75e6e213 509
af0e4ac0
LH
510 c = ' ';
511 if (current) {
512 c = '*';
74bb2dfb 513 color = BRANCH_COLOR_CURRENT;
af0e4ac0 514 }
75e6e213 515
209d336a 516 strbuf_addf(&name, "%s%s", prefix, item->name);
1452bd64
NTND
517 if (verbose) {
518 int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf);
209d336a 519 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
1452bd64 520 maxwidth + utf8_compensation, name.buf,
81474267 521 branch_get_color(BRANCH_COLOR_RESET));
1452bd64 522 } else
209d336a 523 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
81474267 524 name.buf, branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
525
526 if (item->dest)
527 strbuf_addf(&out, " -> %s", item->dest);
6e0332ec
JN
528 else if (verbose)
529 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
530 add_verbose_info(&out, item, verbose, abbrev);
ebe31ef2
NTND
531 if (column_active(colopts)) {
532 assert(!verbose && "--column and --verbose are incompatible");
533 string_list_append(&output, out.buf);
534 } else {
535 printf("%s\n", out.buf);
536 }
209d336a
JS
537 strbuf_release(&name);
538 strbuf_release(&out);
75e6e213
LH
539}
540
b6f637d1
LH
541static int calc_maxwidth(struct ref_list *refs)
542{
209d336a 543 int i, w = 0;
b6f637d1
LH
544 for (i = 0; i < refs->index; i++) {
545 if (!matches_merge_filter(refs->list[i].commit))
546 continue;
1452bd64
NTND
547 if (refs->list[i].width > w)
548 w = refs->list[i].width;
b6f637d1
LH
549 }
550 return w;
551}
552
7e9ff00b
LT
553
554static void show_detached(struct ref_list *ref_list)
555{
556 struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
557
558 if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
559 struct ref_item item;
409fa556 560 item.name = xstrdup(_("(no branch)"));
1452bd64 561 item.width = utf8_strwidth(item.name);
7e9ff00b
LT
562 item.kind = REF_LOCAL_BRANCH;
563 item.dest = NULL;
564 item.commit = head_commit;
1452bd64
NTND
565 if (item.width > ref_list->maxwidth)
566 ref_list->maxwidth = item.width;
7e9ff00b
LT
567 print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, "");
568 free(item.name);
569 }
570}
571
d8d33736 572static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern)
c31820c2
LH
573{
574 int i;
1603ade8 575 struct append_ref_cb cb;
bfcc9214 576 struct ref_list ref_list;
c31820c2 577
bfcc9214
AP
578 memset(&ref_list, 0, sizeof(ref_list));
579 ref_list.kinds = kinds;
191d1ac4 580 ref_list.verbose = verbose;
7e9ff00b 581 ref_list.abbrev = abbrev;
694a5775 582 ref_list.with_commit = with_commit;
68067ca1
JH
583 if (merge_filter != NO_FILTER)
584 init_revisions(&ref_list.revs, NULL);
1603ade8 585 cb.ref_list = &ref_list;
d8d33736 586 cb.pattern = pattern;
1603ade8
SM
587 cb.ret = 0;
588 for_each_rawref(append_ref, &cb);
68067ca1
JH
589 if (merge_filter != NO_FILTER) {
590 struct commit *filter;
591 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
6c41e975 592 if (!filter)
045e3884 593 die(_("object '%s' does not point to a commit"),
6c41e975
CMN
594 sha1_to_hex(merge_filter_ref));
595
68067ca1
JH
596 filter->object.flags |= UNINTERESTING;
597 add_pending_object(&ref_list.revs,
598 (struct object *) filter, "");
599 ref_list.revs.limited = 1;
600 prepare_revision_walk(&ref_list.revs);
b6f637d1
LH
601 if (verbose)
602 ref_list.maxwidth = calc_maxwidth(&ref_list);
68067ca1 603 }
c31820c2 604
bfcc9214 605 qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
c31820c2 606
0016a482 607 detached = (detached && (kinds & REF_LOCAL_BRANCH));
d8d33736 608 if (detached && match_patterns(pattern, "HEAD"))
7e9ff00b 609 show_detached(&ref_list);
0016a482 610
bfcc9214 611 for (i = 0; i < ref_list.index; i++) {
0016a482
LH
612 int current = !detached &&
613 (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
af0e4ac0 614 !strcmp(ref_list.list[i].name, head);
209d336a
JS
615 char *prefix = (kinds != REF_REMOTE_BRANCH &&
616 ref_list.list[i].kind == REF_REMOTE_BRANCH)
617 ? "remotes/" : "";
af0e4ac0 618 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
209d336a 619 abbrev, current, prefix);
c31820c2 620 }
bfcc9214
AP
621
622 free_ref_list(&ref_list);
1603ade8 623
0e9716e6 624 if (cb.ret)
49df4b02 625 error(_("some refs could not be read"));
0e9716e6 626
1603ade8 627 return cb.ret;
c31820c2
LH
628}
629
c976d415
LH
630static void rename_branch(const char *oldname, const char *newname, int force)
631{
da3f78a2 632 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
da3f78a2 633 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
cbdffe40 634 int recovery = 0;
3f59481e 635 int clobber_head_ok;
c976d415 636
c847f537 637 if (!oldname)
49df4b02 638 die(_("cannot rename the current branch while not on any."));
c847f537 639
cbdffe40
JH
640 if (strbuf_check_branch_ref(&oldref, oldname)) {
641 /*
642 * Bad name --- this could be an attempt to rename a
643 * ref that we used to allow to be created by accident.
644 */
c6893323 645 if (ref_exists(oldref.buf))
cbdffe40
JH
646 recovery = 1;
647 else
49df4b02 648 die(_("Invalid branch name: '%s'"), oldname);
cbdffe40 649 }
c976d415 650
3f59481e
JN
651 /*
652 * A command like "git branch -M currentbranch currentbranch" cannot
653 * cause the worktree to become inconsistent with HEAD, so allow it.
654 */
655 clobber_head_ok = !strcmp(oldname, newname);
656
657 validate_new_branchname(newname, &newref, force, clobber_head_ok);
c976d415 658
da3f78a2
MV
659 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
660 oldref.buf, newref.buf);
678d0f4c 661
da3f78a2 662 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
49df4b02 663 die(_("Branch rename failed"));
da3f78a2 664 strbuf_release(&logmsg);
c976d415 665
cbdffe40 666 if (recovery)
49df4b02 667 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
cbdffe40 668
8b5157e4 669 /* no need to pass logmsg here as HEAD didn't really move */
da3f78a2 670 if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
49df4b02 671 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
19eba151 672
da3f78a2
MV
673 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
674 strbuf_release(&oldref);
675 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
676 strbuf_release(&newref);
677 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
49df4b02 678 die(_("Branch is renamed, but update of config-file failed"));
da3f78a2
MV
679 strbuf_release(&oldsection);
680 strbuf_release(&newsection);
c976d415
LH
681}
682
049716b3
JH
683static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
684{
685 merge_filter = ((opt->long_name[0] == 'n')
686 ? SHOW_NOT_MERGED
687 : SHOW_MERGED);
688 if (unset)
689 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
690 if (!arg)
691 arg = "HEAD";
692 if (get_sha1(arg, merge_filter_ref))
49df4b02 693 die(_("malformed object name %s"), arg);
049716b3
JH
694 return 0;
695}
696
b7200e83
JH
697static const char edit_description[] = "BRANCH_DESCRIPTION";
698
699static int edit_branch_description(const char *branch_name)
700{
701 FILE *fp;
702 int status;
703 struct strbuf buf = STRBUF_INIT;
704 struct strbuf name = STRBUF_INIT;
705
706 read_branch_desc(&buf, branch_name);
707 if (!buf.len || buf.buf[buf.len-1] != '\n')
708 strbuf_addch(&buf, '\n');
709 strbuf_addf(&buf,
710 "# Please edit the description for the branch\n"
711 "# %s\n"
712 "# Lines starting with '#' will be stripped.\n",
713 branch_name);
714 fp = fopen(git_path(edit_description), "w");
715 if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) {
716 strbuf_release(&buf);
82247e9b 717 return error(_("could not write branch description template: %s"),
b7200e83
JH
718 strerror(errno));
719 }
720 strbuf_reset(&buf);
721 if (launch_editor(git_path(edit_description), &buf, NULL)) {
722 strbuf_release(&buf);
723 return -1;
724 }
725 stripspace(&buf, 1);
726
727 strbuf_addf(&name, "branch.%s.description", branch_name);
4b5553b5 728 status = git_config_set(name.buf, buf.len ? buf.buf : NULL);
b7200e83
JH
729 strbuf_release(&name);
730 strbuf_release(&buf);
731
732 return status;
733}
734
c31820c2
LH
735int cmd_branch(int argc, const char **argv, const char *prefix)
736{
cddd127b 737 int delete = 0, rename = 0, force_create = 0, list = 0;
b792c067 738 int verbose = 0, abbrev = -1, detached = 0;
b7200e83 739 int reflog = 0, edit_description = 0;
b84869ef 740 int quiet = 0, unset_upstream = 0;
6183d826 741 const char *new_upstream = NULL;
9ed36cfa 742 enum branch_track track;
d11d44fa 743 int kinds = REF_LOCAL_BRANCH;
694a5775 744 struct commit_list *with_commit = NULL;
a8dfd5ea
PH
745
746 struct option options[] = {
24a85214 747 OPT_GROUP(N_("Generic options")),
39271425 748 OPT__VERBOSE(&verbose,
24a85214
NTND
749 N_("show hash and subject, give twice for upstream branch")),
750 OPT__QUIET(&quiet, N_("suppress informational messages")),
751 OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
9ed36cfa 752 BRANCH_TRACK_EXPLICIT),
24a85214 753 OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
4fc50066 754 BRANCH_TRACK_OVERRIDE),
6183d826 755 OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
b84869ef 756 OPT_BOOLEAN(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
24a85214
NTND
757 OPT__COLOR(&branch_use_color, N_("use colored output")),
758 OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"),
d11d44fa 759 REF_REMOTE_BRANCH),
e84fb2ff 760 {
24a85214
NTND
761 OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
762 N_("print only branches that contain the commit"),
e84fb2ff 763 PARSE_OPT_LASTARG_DEFAULT,
269defdf 764 parse_opt_with_commit, (intptr_t)"HEAD",
e84fb2ff 765 },
694a5775 766 {
24a85214
NTND
767 OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
768 N_("print only branches that contain the commit"),
e84fb2ff 769 PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
269defdf 770 parse_opt_with_commit, (intptr_t) "HEAD",
694a5775 771 },
a8dfd5ea
PH
772 OPT__ABBREV(&abbrev),
773
24a85214
NTND
774 OPT_GROUP(N_("Specific git-branch actions:")),
775 OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"),
d11d44fa 776 REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
24a85214
NTND
777 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
778 OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
779 OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
780 OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
781 OPT_BOOLEAN(0, "list", &list, N_("list branch names")),
782 OPT_BOOLEAN('l', "create-reflog", &reflog, N_("create the branch's reflog")),
b7200e83 783 OPT_BOOLEAN(0, "edit-description", &edit_description,
24a85214
NTND
784 N_("edit the description for the branch")),
785 OPT__FORCE(&force_create, N_("force creation (when already exists)")),
049716b3
JH
786 {
787 OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
24a85214 788 N_("commit"), N_("print only not merged branches"),
049716b3
JH
789 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
790 opt_parse_merge_filter, (intptr_t) "HEAD",
791 },
792 {
793 OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
24a85214 794 N_("commit"), N_("print only merged branches"),
049716b3
JH
795 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
796 opt_parse_merge_filter, (intptr_t) "HEAD",
797 },
24a85214 798 OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
a8dfd5ea
PH
799 OPT_END(),
800 };
c31820c2 801
1dacfbcf
NTND
802 if (argc == 2 && !strcmp(argv[1], "-h"))
803 usage_with_options(builtin_branch_usage, options);
804
ef90d6d4 805 git_config(git_branch_config, NULL);
6b2f2d98 806
9ed36cfa 807 track = git_branch_track;
c976d415 808
96ec7b1e 809 head = resolve_refdup("HEAD", head_sha1, 0, NULL);
c31820c2 810 if (!head)
49df4b02 811 die(_("Failed to resolve HEAD as a valid ref."));
0016a482
LH
812 if (!strcmp(head, "HEAD")) {
813 detached = 1;
a8dfd5ea 814 } else {
cc44c765 815 if (prefixcmp(head, "refs/heads/"))
49df4b02 816 die(_("HEAD not found below refs/heads!"));
0016a482
LH
817 head += 11;
818 }
049716b3
JH
819 hashcpy(merge_filter_ref, head_sha1);
820
ebe31ef2 821
37782920
SB
822 argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
823 0);
cddd127b 824
b84869ef 825 if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
cddd127b
MG
826 list = 1;
827
d0403508
JK
828 if (with_commit || merge_filter != NO_FILTER)
829 list = 1;
830
b84869ef 831 if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1)
049716b3 832 usage_with_options(builtin_branch_usage, options);
c31820c2 833
b792c067
NK
834 if (abbrev == -1)
835 abbrev = DEFAULT_ABBREV;
ebe31ef2
NTND
836 finalize_colopts(&colopts, -1);
837 if (verbose) {
838 if (explicitly_enable_column(colopts))
839 die(_("--column and --verbose are incompatible"));
840 colopts = 0;
841 }
b792c067 842
640d0401
NTND
843 if (delete) {
844 if (!argc)
845 die(_("branch name required"));
d65ddf19 846 return delete_branches(argc, argv, delete > 1, kinds, quiet);
640d0401 847 } else if (list) {
ebe31ef2
NTND
848 int ret = print_ref_list(kinds, detached, verbose, abbrev,
849 with_commit, argv);
850 print_columns(&output, colopts, NULL);
851 string_list_clear(&output, 0);
852 return ret;
853 }
b7200e83
JH
854 else if (edit_description) {
855 const char *branch_name;
c2d17ba3
JH
856 struct strbuf branch_ref = STRBUF_INIT;
857
75135b23
NTND
858 if (!argc) {
859 if (detached)
045e3884 860 die(_("Cannot give description to detached HEAD"));
b7200e83 861 branch_name = head;
75135b23 862 } else if (argc == 1)
b7200e83
JH
863 branch_name = argv[0];
864 else
43722c4d 865 die(_("cannot edit description of more than one branch"));
c2d17ba3
JH
866
867 strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
868 if (!ref_exists(branch_ref.buf)) {
869 strbuf_release(&branch_ref);
870
871 if (!argc)
045e3884 872 return error(_("No commit on branch '%s' yet."),
c2d17ba3
JH
873 branch_name);
874 else
045e3884
NTND
875 return error(_("No branch named '%s'."),
876 branch_name);
c2d17ba3
JH
877 }
878 strbuf_release(&branch_ref);
879
b7200e83
JH
880 if (edit_branch_description(branch_name))
881 return 1;
a4043aea 882 } else if (rename) {
3706ed29
TRC
883 if (argc == 1)
884 rename_branch(head, argv[0], rename > 1);
885 else if (argc == 2)
886 rename_branch(argv[0], argv[1], rename > 1);
887 else
43722c4d 888 die(_("too many branches for a rename operation"));
6183d826
CMN
889 } else if (new_upstream) {
890 struct branch *branch = branch_get(argv[0]);
891
892 if (!ref_exists(branch->refname))
893 die(_("branch '%s' does not exist"), branch->name);
894
895 /*
896 * create_branch takes care of setting up the tracking
897 * info and making sure new_upstream is correct
898 */
899 create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
b84869ef
CMN
900 } else if (unset_upstream) {
901 struct branch *branch = branch_get(argv[0]);
902 struct strbuf buf = STRBUF_INIT;
903
904 if (!branch_has_merge_config(branch)) {
905 die(_("Branch '%s' has no upstream information"), branch->name);
906 }
907
908 strbuf_addf(&buf, "branch.%s.remote", branch->name);
909 git_config_set_multivar(buf.buf, NULL, NULL, 1);
910 strbuf_reset(&buf);
911 strbuf_addf(&buf, "branch.%s.merge", branch->name);
912 git_config_set_multivar(buf.buf, NULL, NULL, 1);
913 strbuf_release(&buf);
5cd75c7d 914 } else if (argc > 0 && argc <= 2) {
b347d06b
CMN
915 struct branch *branch = branch_get(argv[0]);
916 int branch_existed = 0, remote_tracking = 0;
917 struct strbuf buf = STRBUF_INIT;
918
6e8f993a 919 if (kinds != REF_LOCAL_BRANCH)
49df4b02 920 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
b347d06b
CMN
921
922 if (track == BRANCH_TRACK_OVERRIDE)
923 fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
924
925 strbuf_addf(&buf, "refs/remotes/%s", branch->name);
926 remote_tracking = ref_exists(buf.buf);
927 strbuf_release(&buf);
928
929 branch_existed = ref_exists(branch->refname);
e496c003 930 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
d65ddf19 931 force_create, reflog, 0, quiet, track);
b347d06b
CMN
932
933 /*
934 * We only show the instructions if the user gave us
935 * one branch which doesn't exist locally, but is the
936 * name of a remote-tracking branch.
937 */
938 if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
939 !branch_existed && remote_tracking) {
940 fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
941 fprintf(stderr, _(" git branch -d %s\n"), branch->name);
942 fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name);
943 }
944
6e8f993a 945 } else
a8dfd5ea 946 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
947
948 return 0;
949}