git branch: avoid unnecessary object lookups
[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>]",
22 "git branch [options] [-r] (-d | -D) <branchname>",
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,
46 BRANCH_COLOR_CURRENT = 4,
a1158cae
AP
47};
48
049716b3
JH
49static enum merge_filter {
50 NO_FILTER = 0,
51 SHOW_NOT_MERGED,
52 SHOW_MERGED,
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;
a1158cae
AP
68 die("bad config variable '%s'", var);
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")) {
0f6f5a40 74 branch_use_color = git_config_colorbool(var, value, -1);
a1158cae
AP
75 return 0;
76 }
cc44c765 77 if (!prefixcmp(var, "color.branch.")) {
a1158cae 78 int slot = parse_branch_color_slot(var, 13);
5768c98a
JH
79 if (!value)
80 return config_error_nonbool(var);
a1158cae
AP
81 color_parse(value, var, branch_colors[slot]);
82 return 0;
83 }
ef90d6d4 84 return git_color_default_config(var, value, cb);
a1158cae
AP
85}
86
52fae7de 87static const char *branch_get_color(enum color_branch ix)
a1158cae 88{
6b2f2d98 89 if (branch_use_color > 0)
a1158cae
AP
90 return branch_colors[ix];
91 return "";
92}
93
b8e9a00d 94static int delete_branches(int argc, const char **argv, int force, int kinds)
c31820c2 95{
67affd51 96 struct commit *rev, *head_rev = head_rev;
c31820c2 97 unsigned char sha1[20];
b8e9a00d 98 char *name = NULL;
f3d985c3 99 const char *fmt, *remote;
c31820c2 100 int i;
b8e9a00d 101 int ret = 0;
8415d5c7 102 struct strbuf bname = STRBUF_INIT;
c31820c2 103
f3d985c3
JH
104 switch (kinds) {
105 case REF_REMOTE_BRANCH:
106 fmt = "refs/remotes/%s";
107 remote = "remote ";
108 force = 1;
109 break;
110 case REF_LOCAL_BRANCH:
111 fmt = "refs/heads/%s";
112 remote = "";
113 break;
114 default:
115 die("cannot use -a with -d");
116 }
c31820c2 117
67affd51
JH
118 if (!force) {
119 head_rev = lookup_commit_reference(head_sha1);
120 if (!head_rev)
121 die("Couldn't look up commit object for HEAD");
122 }
8415d5c7 123 for (i = 0; i < argc; i++, strbuf_release(&bname)) {
a552de75 124 strbuf_branchname(&bname, argv[i]);
8415d5c7 125 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
b8e9a00d 126 error("Cannot delete the branch '%s' "
8415d5c7 127 "which you are currently on.", bname.buf);
b8e9a00d
QT
128 ret = 1;
129 continue;
130 }
131
8e0f7003 132 free(name);
c31820c2 133
8415d5c7 134 name = xstrdup(mkpath(fmt, bname.buf));
b8e9a00d
QT
135 if (!resolve_ref(name, sha1, 1, NULL)) {
136 error("%sbranch '%s' not found.",
8415d5c7 137 remote, bname.buf);
b8e9a00d
QT
138 ret = 1;
139 continue;
140 }
c31820c2
LH
141
142 rev = lookup_commit_reference(sha1);
b8e9a00d
QT
143 if (!rev) {
144 error("Couldn't look up commit object for '%s'", name);
145 ret = 1;
146 continue;
147 }
c31820c2
LH
148
149 /* This checks whether the merge bases of branch and
150 * HEAD contains branch -- which means that the HEAD
151 * contains everything in both.
152 */
153
154 if (!force &&
03840fc3 155 !in_merge_bases(rev, &head_rev, 1)) {
00ae8289 156 error("The branch '%s' is not an ancestor of "
8415d5c7
JH
157 "your current HEAD.\n"
158 "If you are sure you want to delete it, "
159 "run 'git branch -D %s'.", bname.buf, bname.buf);
b8e9a00d
QT
160 ret = 1;
161 continue;
c31820c2
LH
162 }
163
eca35a25 164 if (delete_ref(name, sha1, 0)) {
b8e9a00d 165 error("Error deleting %sbranch '%s'", remote,
8415d5c7 166 bname.buf);
b8e9a00d 167 ret = 1;
f1eccbab 168 } else {
3c59c50d 169 struct strbuf buf = STRBUF_INIT;
23fd723c 170 printf("Deleted %sbranch %s (was %s).\n", remote,
8415d5c7
JH
171 bname.buf,
172 find_unique_abbrev(sha1, DEFAULT_ABBREV));
173 strbuf_addf(&buf, "branch.%s", bname.buf);
3c59c50d 174 if (git_config_rename_section(buf.buf, NULL) < 0)
f1eccbab 175 warning("Update of config-file failed");
3c59c50d 176 strbuf_release(&buf);
f1eccbab 177 }
c31820c2 178 }
c31820c2 179
8e0f7003 180 free(name);
b8e9a00d
QT
181
182 return(ret);
c31820c2 183}
c31820c2 184
bfcc9214
AP
185struct ref_item {
186 char *name;
209d336a
JS
187 char *dest;
188 unsigned int kind, len;
68067ca1 189 struct commit *commit;
bfcc9214
AP
190};
191
192struct ref_list {
68067ca1 193 struct rev_info revs;
191d1ac4 194 int index, alloc, maxwidth, verbose;
bfcc9214 195 struct ref_item *list;
694a5775 196 struct commit_list *with_commit;
bfcc9214
AP
197 int kinds;
198};
199
209d336a
JS
200static char *resolve_symref(const char *src, const char *prefix)
201{
202 unsigned char sha1[20];
203 int flag;
204 const char *dst, *cp;
205
206 dst = resolve_ref(src, sha1, 0, &flag);
207 if (!(dst && (flag & REF_ISSYMREF)))
208 return NULL;
209 if (prefix && (cp = skip_prefix(dst, prefix)))
210 dst = cp;
211 return xstrdup(dst);
212}
213
bfcc9214 214static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
c31820c2 215{
bfcc9214
AP
216 struct ref_list *ref_list = (struct ref_list*)(cb_data);
217 struct ref_item *newitem;
68067ca1 218 struct commit *commit;
209d336a
JS
219 int kind, i;
220 const char *prefix, *orig_refname = refname;
221
222 static struct {
223 int kind;
224 const char *prefix;
225 int pfxlen;
226 } ref_kind[] = {
227 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
228 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
229 };
bfcc9214
AP
230
231 /* Detect kind */
209d336a
JS
232 for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
233 prefix = ref_kind[i].prefix;
234 if (strncmp(refname, prefix, ref_kind[i].pfxlen))
235 continue;
236 kind = ref_kind[i].kind;
237 refname += ref_kind[i].pfxlen;
238 break;
239 }
240 if (ARRAY_SIZE(ref_kind) <= i)
0f31d680 241 return 0;
bfcc9214 242
e6e4a47b
LT
243 /* Don't add types the caller doesn't want */
244 if ((kind & ref_list->kinds) == 0)
245 return 0;
246
191d1ac4
LT
247 commit = NULL;
248 if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
249 commit = lookup_commit_reference_gently(sha1, 1);
250 if (!commit)
251 return error("branch '%s' does not point at a commit", refname);
68067ca1 252
191d1ac4
LT
253 /* Filter with with_commit if specified */
254 if (!is_descendant_of(commit, ref_list->with_commit))
255 return 0;
694a5775 256
191d1ac4
LT
257 if (merge_filter != NO_FILTER)
258 add_pending_object(&ref_list->revs,
259 (struct object *)commit, refname);
260 }
e8b404c2 261
bfcc9214
AP
262 /* Resize buffer */
263 if (ref_list->index >= ref_list->alloc) {
264 ref_list->alloc = alloc_nr(ref_list->alloc);
265 ref_list->list = xrealloc(ref_list->list,
266 ref_list->alloc * sizeof(struct ref_item));
c31820c2
LH
267 }
268
bfcc9214
AP
269 /* Record the new item */
270 newitem = &(ref_list->list[ref_list->index++]);
271 newitem->name = xstrdup(refname);
272 newitem->kind = kind;
68067ca1 273 newitem->commit = commit;
209d336a
JS
274 newitem->len = strlen(refname);
275 newitem->dest = resolve_symref(orig_refname, prefix);
276 /* adjust for "remotes/" */
277 if (newitem->kind == REF_REMOTE_BRANCH &&
278 ref_list->kinds != REF_REMOTE_BRANCH)
279 newitem->len += 8;
280 if (newitem->len > ref_list->maxwidth)
281 ref_list->maxwidth = newitem->len;
c31820c2
LH
282
283 return 0;
284}
285
bfcc9214
AP
286static void free_ref_list(struct ref_list *ref_list)
287{
288 int i;
289
209d336a 290 for (i = 0; i < ref_list->index; i++) {
bfcc9214 291 free(ref_list->list[i].name);
209d336a
JS
292 free(ref_list->list[i].dest);
293 }
bfcc9214
AP
294 free(ref_list->list);
295}
296
c31820c2
LH
297static int ref_cmp(const void *r1, const void *r2)
298{
bfcc9214
AP
299 struct ref_item *c1 = (struct ref_item *)(r1);
300 struct ref_item *c2 = (struct ref_item *)(r2);
301
302 if (c1->kind != c2->kind)
303 return c1->kind - c2->kind;
304 return strcmp(c1->name, c2->name);
c31820c2
LH
305}
306
2d8a7f0b
JK
307static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
308 int show_upstream_ref)
94fcb730
JH
309{
310 int ours, theirs;
311 struct branch *branch = branch_get(branch_name);
312
2d8a7f0b
JK
313 if (!stat_tracking_info(branch, &ours, &theirs)) {
314 if (branch && branch->merge && branch->merge[0]->dst &&
315 show_upstream_ref)
316 strbuf_addf(stat, "[%s] ",
6e7b3309 317 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
94fcb730 318 return;
2d8a7f0b
JK
319 }
320
321 strbuf_addch(stat, '[');
322 if (show_upstream_ref)
323 strbuf_addf(stat, "%s: ",
6e7b3309 324 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
94fcb730 325 if (!ours)
2d8a7f0b 326 strbuf_addf(stat, "behind %d] ", theirs);
94fcb730 327 else if (!theirs)
2d8a7f0b 328 strbuf_addf(stat, "ahead %d] ", ours);
94fcb730 329 else
2d8a7f0b 330 strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
94fcb730
JH
331}
332
7950cda7
LH
333static int matches_merge_filter(struct commit *commit)
334{
335 int is_merged;
336
337 if (merge_filter == NO_FILTER)
338 return 1;
339
340 is_merged = !!(commit->object.flags & UNINTERESTING);
341 return (is_merged == (merge_filter == SHOW_MERGED));
342}
343
af0e4ac0 344static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
209d336a 345 int abbrev, int current, char *prefix)
75e6e213 346{
af0e4ac0
LH
347 char c;
348 int color;
68067ca1 349 struct commit *commit = item->commit;
209d336a 350 struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
68067ca1 351
7950cda7
LH
352 if (!matches_merge_filter(commit))
353 return;
75e6e213 354
af0e4ac0
LH
355 switch (item->kind) {
356 case REF_LOCAL_BRANCH:
74bb2dfb 357 color = BRANCH_COLOR_LOCAL;
af0e4ac0
LH
358 break;
359 case REF_REMOTE_BRANCH:
74bb2dfb 360 color = BRANCH_COLOR_REMOTE;
af0e4ac0
LH
361 break;
362 default:
74bb2dfb 363 color = BRANCH_COLOR_PLAIN;
af0e4ac0
LH
364 break;
365 }
75e6e213 366
af0e4ac0
LH
367 c = ' ';
368 if (current) {
369 c = '*';
74bb2dfb 370 color = BRANCH_COLOR_CURRENT;
af0e4ac0 371 }
75e6e213 372
209d336a
JS
373 strbuf_addf(&name, "%s%s", prefix, item->name);
374 if (verbose)
375 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
376 maxwidth, name.buf,
81474267 377 branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
378 else
379 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
81474267 380 name.buf, branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
381
382 if (item->dest)
383 strbuf_addf(&out, " -> %s", item->dest);
384 else if (verbose) {
d3f9f9a9 385 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
80583c0e 386 const char *sub = " **** invalid ref ****";
674d1727 387
68067ca1 388 commit = item->commit;
80583c0e 389 if (commit && !parse_commit(commit)) {
674d1727 390 pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84 391 &subject, 0, NULL, NULL, 0, 0);
674d1727 392 sub = subject.buf;
80583c0e 393 }
94fcb730
JH
394
395 if (item->kind == REF_LOCAL_BRANCH)
2d8a7f0b 396 fill_tracking_info(&stat, item->name, verbose > 1);
94fcb730 397
209d336a
JS
398 strbuf_addf(&out, " %s %s%s",
399 find_unique_abbrev(item->commit->object.sha1, abbrev),
400 stat.buf, sub);
d3f9f9a9 401 strbuf_release(&stat);
674d1727 402 strbuf_release(&subject);
af0e4ac0 403 }
209d336a
JS
404 printf("%s\n", out.buf);
405 strbuf_release(&name);
406 strbuf_release(&out);
75e6e213
LH
407}
408
b6f637d1
LH
409static int calc_maxwidth(struct ref_list *refs)
410{
209d336a 411 int i, w = 0;
b6f637d1
LH
412 for (i = 0; i < refs->index; i++) {
413 if (!matches_merge_filter(refs->list[i].commit))
414 continue;
209d336a
JS
415 if (refs->list[i].len > w)
416 w = refs->list[i].len;
b6f637d1
LH
417 }
418 return w;
419}
420
694a5775 421static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
c31820c2
LH
422{
423 int i;
bfcc9214 424 struct ref_list ref_list;
68067ca1 425 struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
c31820c2 426
bfcc9214
AP
427 memset(&ref_list, 0, sizeof(ref_list));
428 ref_list.kinds = kinds;
191d1ac4 429 ref_list.verbose = verbose;
694a5775 430 ref_list.with_commit = with_commit;
68067ca1
JH
431 if (merge_filter != NO_FILTER)
432 init_revisions(&ref_list.revs, NULL);
e6e4a47b 433 for_each_rawref(append_ref, &ref_list);
68067ca1
JH
434 if (merge_filter != NO_FILTER) {
435 struct commit *filter;
436 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
437 filter->object.flags |= UNINTERESTING;
438 add_pending_object(&ref_list.revs,
439 (struct object *) filter, "");
440 ref_list.revs.limited = 1;
441 prepare_revision_walk(&ref_list.revs);
b6f637d1
LH
442 if (verbose)
443 ref_list.maxwidth = calc_maxwidth(&ref_list);
68067ca1 444 }
c31820c2 445
bfcc9214 446 qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
c31820c2 447
0016a482 448 detached = (detached && (kinds & REF_LOCAL_BRANCH));
7fcdb36e
JG
449 if (detached && head_commit &&
450 is_descendant_of(head_commit, with_commit)) {
0016a482 451 struct ref_item item;
3a55602e 452 item.name = xstrdup("(no branch)");
45e2b614 453 item.len = strlen(item.name);
0016a482 454 item.kind = REF_LOCAL_BRANCH;
45e2b614 455 item.dest = NULL;
68067ca1 456 item.commit = head_commit;
66648ad7
JK
457 if (item.len > ref_list.maxwidth)
458 ref_list.maxwidth = item.len;
209d336a 459 print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1, "");
3a55602e 460 free(item.name);
0016a482
LH
461 }
462
bfcc9214 463 for (i = 0; i < ref_list.index; i++) {
0016a482
LH
464 int current = !detached &&
465 (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
af0e4ac0 466 !strcmp(ref_list.list[i].name, head);
209d336a
JS
467 char *prefix = (kinds != REF_REMOTE_BRANCH &&
468 ref_list.list[i].kind == REF_REMOTE_BRANCH)
469 ? "remotes/" : "";
af0e4ac0 470 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
209d336a 471 abbrev, current, prefix);
c31820c2 472 }
bfcc9214
AP
473
474 free_ref_list(&ref_list);
c31820c2
LH
475}
476
c976d415
LH
477static void rename_branch(const char *oldname, const char *newname, int force)
478{
da3f78a2 479 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
c976d415 480 unsigned char sha1[20];
da3f78a2 481 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
cbdffe40 482 int recovery = 0;
c976d415 483
c847f537 484 if (!oldname)
3dff5379 485 die("cannot rename the current branch while not on any.");
c847f537 486
cbdffe40
JH
487 if (strbuf_check_branch_ref(&oldref, oldname)) {
488 /*
489 * Bad name --- this could be an attempt to rename a
490 * ref that we used to allow to be created by accident.
491 */
492 if (resolve_ref(oldref.buf, sha1, 1, NULL))
493 recovery = 1;
494 else
495 die("Invalid branch name: '%s'", oldname);
496 }
c976d415 497
a2fab531 498 if (strbuf_check_branch_ref(&newref, newname))
03d3aada 499 die("Invalid branch name: '%s'", newname);
c976d415 500
da3f78a2 501 if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
03d3aada 502 die("A branch named '%s' already exists.", newref.buf + 11);
c976d415 503
da3f78a2
MV
504 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
505 oldref.buf, newref.buf);
678d0f4c 506
da3f78a2 507 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
c976d415 508 die("Branch rename failed");
da3f78a2 509 strbuf_release(&logmsg);
c976d415 510
cbdffe40
JH
511 if (recovery)
512 warning("Renamed a misnamed branch '%s' away", oldref.buf + 11);
513
8b5157e4 514 /* no need to pass logmsg here as HEAD didn't really move */
da3f78a2 515 if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
c976d415 516 die("Branch renamed to %s, but HEAD is not updated!", newname);
19eba151 517
da3f78a2
MV
518 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
519 strbuf_release(&oldref);
520 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
521 strbuf_release(&newref);
522 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
19eba151 523 die("Branch is renamed, but update of config-file failed");
da3f78a2
MV
524 strbuf_release(&oldsection);
525 strbuf_release(&newsection);
c976d415
LH
526}
527
049716b3
JH
528static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
529{
530 merge_filter = ((opt->long_name[0] == 'n')
531 ? SHOW_NOT_MERGED
532 : SHOW_MERGED);
533 if (unset)
534 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
535 if (!arg)
536 arg = "HEAD";
537 if (get_sha1(arg, merge_filter_ref))
538 die("malformed object name %s", arg);
539 return 0;
540}
541
c31820c2
LH
542int cmd_branch(int argc, const char **argv, const char *prefix)
543{
d11d44fa 544 int delete = 0, rename = 0, force_create = 0;
0016a482 545 int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
9ed36cfa
JS
546 int reflog = 0;
547 enum branch_track track;
d11d44fa 548 int kinds = REF_LOCAL_BRANCH;
694a5775 549 struct commit_list *with_commit = NULL;
a8dfd5ea
PH
550
551 struct option options[] = {
552 OPT_GROUP("Generic options"),
553 OPT__VERBOSE(&verbose),
9ed36cfa
JS
554 OPT_SET_INT( 0 , "track", &track, "set up tracking mode (see git-pull(1))",
555 BRANCH_TRACK_EXPLICIT),
a8dfd5ea 556 OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"),
d11d44fa
PH
557 OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
558 REF_REMOTE_BRANCH),
e84fb2ff
JH
559 {
560 OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
561 "print only branches that contain the commit",
562 PARSE_OPT_LASTARG_DEFAULT,
269defdf 563 parse_opt_with_commit, (intptr_t)"HEAD",
e84fb2ff 564 },
694a5775
JH
565 {
566 OPTION_CALLBACK, 0, "with", &with_commit, "commit",
567 "print only branches that contain the commit",
e84fb2ff 568 PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
269defdf 569 parse_opt_with_commit, (intptr_t) "HEAD",
694a5775 570 },
a8dfd5ea
PH
571 OPT__ABBREV(&abbrev),
572
573 OPT_GROUP("Specific git-branch actions:"),
d11d44fa
PH
574 OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
575 REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
576 OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
577 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
578 OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
579 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
580 OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
581 OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
049716b3
JH
582 {
583 OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
584 "commit", "print only not merged branches",
585 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
586 opt_parse_merge_filter, (intptr_t) "HEAD",
587 },
588 {
589 OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
590 "commit", "print only merged branches",
591 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
592 opt_parse_merge_filter, (intptr_t) "HEAD",
593 },
a8dfd5ea
PH
594 OPT_END(),
595 };
c31820c2 596
ef90d6d4 597 git_config(git_branch_config, NULL);
6b2f2d98
MK
598
599 if (branch_use_color == -1)
600 branch_use_color = git_use_color_default;
601
9ed36cfa 602 track = git_branch_track;
c976d415 603
078f8380 604 head = resolve_ref("HEAD", head_sha1, 0, NULL);
c31820c2
LH
605 if (!head)
606 die("Failed to resolve HEAD as a valid ref.");
078f8380 607 head = xstrdup(head);
0016a482
LH
608 if (!strcmp(head, "HEAD")) {
609 detached = 1;
a8dfd5ea 610 } else {
cc44c765 611 if (prefixcmp(head, "refs/heads/"))
0016a482
LH
612 die("HEAD not found below refs/heads!");
613 head += 11;
614 }
049716b3
JH
615 hashcpy(merge_filter_ref, head_sha1);
616
617 argc = parse_options(argc, argv, options, builtin_branch_usage, 0);
618 if (!!delete + !!rename + !!force_create > 1)
619 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
620
621 if (delete)
d11d44fa 622 return delete_branches(argc, argv, delete > 1, kinds);
a8dfd5ea 623 else if (argc == 0)
694a5775 624 print_ref_list(kinds, detached, verbose, abbrev, with_commit);
a8dfd5ea 625 else if (rename && (argc == 1))
d11d44fa 626 rename_branch(head, argv[0], rename > 1);
a8dfd5ea 627 else if (rename && (argc == 2))
d11d44fa 628 rename_branch(argv[0], argv[1], rename > 1);
a8dfd5ea 629 else if (argc <= 2)
e496c003 630 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
45994a1e 631 force_create, reflog, track);
c31820c2 632 else
a8dfd5ea 633 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
634
635 return 0;
636}