strbuf_check_branch_ref(): a helper to check a refname for a branch
[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;
8415d5c7
JH
170 printf("Deleted %sbranch %s (%s).\n", remote,
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;
75e6e213 194 int index, alloc, maxwidth;
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
68067ca1
JH
243 commit = lookup_commit_reference_gently(sha1, 1);
244 if (!commit)
245 return error("branch '%s' does not point at a commit", refname);
246
694a5775 247 /* Filter with with_commit if specified */
7fcdb36e 248 if (!is_descendant_of(commit, ref_list->with_commit))
694a5775
JH
249 return 0;
250
bfcc9214
AP
251 /* Don't add types the caller doesn't want */
252 if ((kind & ref_list->kinds) == 0)
253 return 0;
254
346d437a 255 if (merge_filter != NO_FILTER)
68067ca1 256 add_pending_object(&ref_list->revs,
346d437a 257 (struct object *)commit, refname);
e8b404c2 258
bfcc9214
AP
259 /* Resize buffer */
260 if (ref_list->index >= ref_list->alloc) {
261 ref_list->alloc = alloc_nr(ref_list->alloc);
262 ref_list->list = xrealloc(ref_list->list,
263 ref_list->alloc * sizeof(struct ref_item));
c31820c2
LH
264 }
265
bfcc9214
AP
266 /* Record the new item */
267 newitem = &(ref_list->list[ref_list->index++]);
268 newitem->name = xstrdup(refname);
269 newitem->kind = kind;
68067ca1 270 newitem->commit = commit;
209d336a
JS
271 newitem->len = strlen(refname);
272 newitem->dest = resolve_symref(orig_refname, prefix);
273 /* adjust for "remotes/" */
274 if (newitem->kind == REF_REMOTE_BRANCH &&
275 ref_list->kinds != REF_REMOTE_BRANCH)
276 newitem->len += 8;
277 if (newitem->len > ref_list->maxwidth)
278 ref_list->maxwidth = newitem->len;
c31820c2
LH
279
280 return 0;
281}
282
bfcc9214
AP
283static void free_ref_list(struct ref_list *ref_list)
284{
285 int i;
286
209d336a 287 for (i = 0; i < ref_list->index; i++) {
bfcc9214 288 free(ref_list->list[i].name);
209d336a
JS
289 free(ref_list->list[i].dest);
290 }
bfcc9214
AP
291 free(ref_list->list);
292}
293
c31820c2
LH
294static int ref_cmp(const void *r1, const void *r2)
295{
bfcc9214
AP
296 struct ref_item *c1 = (struct ref_item *)(r1);
297 struct ref_item *c2 = (struct ref_item *)(r2);
298
299 if (c1->kind != c2->kind)
300 return c1->kind - c2->kind;
301 return strcmp(c1->name, c2->name);
c31820c2
LH
302}
303
d3f9f9a9 304static void fill_tracking_info(struct strbuf *stat, const char *branch_name)
94fcb730
JH
305{
306 int ours, theirs;
307 struct branch *branch = branch_get(branch_name);
308
926ab840 309 if (!stat_tracking_info(branch, &ours, &theirs) || (!ours && !theirs))
94fcb730 310 return;
94fcb730 311 if (!ours)
d3f9f9a9 312 strbuf_addf(stat, "[behind %d] ", theirs);
94fcb730 313 else if (!theirs)
d3f9f9a9 314 strbuf_addf(stat, "[ahead %d] ", ours);
94fcb730 315 else
d3f9f9a9 316 strbuf_addf(stat, "[ahead %d, behind %d] ", ours, theirs);
94fcb730
JH
317}
318
7950cda7
LH
319static int matches_merge_filter(struct commit *commit)
320{
321 int is_merged;
322
323 if (merge_filter == NO_FILTER)
324 return 1;
325
326 is_merged = !!(commit->object.flags & UNINTERESTING);
327 return (is_merged == (merge_filter == SHOW_MERGED));
328}
329
af0e4ac0 330static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
209d336a 331 int abbrev, int current, char *prefix)
75e6e213 332{
af0e4ac0
LH
333 char c;
334 int color;
68067ca1 335 struct commit *commit = item->commit;
209d336a 336 struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
68067ca1 337
7950cda7
LH
338 if (!matches_merge_filter(commit))
339 return;
75e6e213 340
af0e4ac0
LH
341 switch (item->kind) {
342 case REF_LOCAL_BRANCH:
74bb2dfb 343 color = BRANCH_COLOR_LOCAL;
af0e4ac0
LH
344 break;
345 case REF_REMOTE_BRANCH:
74bb2dfb 346 color = BRANCH_COLOR_REMOTE;
af0e4ac0
LH
347 break;
348 default:
74bb2dfb 349 color = BRANCH_COLOR_PLAIN;
af0e4ac0
LH
350 break;
351 }
75e6e213 352
af0e4ac0
LH
353 c = ' ';
354 if (current) {
355 c = '*';
74bb2dfb 356 color = BRANCH_COLOR_CURRENT;
af0e4ac0 357 }
75e6e213 358
209d336a
JS
359 strbuf_addf(&name, "%s%s", prefix, item->name);
360 if (verbose)
361 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
362 maxwidth, name.buf,
81474267 363 branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
364 else
365 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
81474267 366 name.buf, branch_get_color(BRANCH_COLOR_RESET));
209d336a
JS
367
368 if (item->dest)
369 strbuf_addf(&out, " -> %s", item->dest);
370 else if (verbose) {
d3f9f9a9 371 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
80583c0e 372 const char *sub = " **** invalid ref ****";
674d1727 373
68067ca1 374 commit = item->commit;
80583c0e 375 if (commit && !parse_commit(commit)) {
674d1727 376 pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84 377 &subject, 0, NULL, NULL, 0, 0);
674d1727 378 sub = subject.buf;
80583c0e 379 }
94fcb730
JH
380
381 if (item->kind == REF_LOCAL_BRANCH)
d3f9f9a9 382 fill_tracking_info(&stat, item->name);
94fcb730 383
209d336a
JS
384 strbuf_addf(&out, " %s %s%s",
385 find_unique_abbrev(item->commit->object.sha1, abbrev),
386 stat.buf, sub);
d3f9f9a9 387 strbuf_release(&stat);
674d1727 388 strbuf_release(&subject);
af0e4ac0 389 }
209d336a
JS
390 printf("%s\n", out.buf);
391 strbuf_release(&name);
392 strbuf_release(&out);
75e6e213
LH
393}
394
b6f637d1
LH
395static int calc_maxwidth(struct ref_list *refs)
396{
209d336a 397 int i, w = 0;
b6f637d1
LH
398 for (i = 0; i < refs->index; i++) {
399 if (!matches_merge_filter(refs->list[i].commit))
400 continue;
209d336a
JS
401 if (refs->list[i].len > w)
402 w = refs->list[i].len;
b6f637d1
LH
403 }
404 return w;
405}
406
694a5775 407static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
c31820c2
LH
408{
409 int i;
bfcc9214 410 struct ref_list ref_list;
68067ca1 411 struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
c31820c2 412
bfcc9214
AP
413 memset(&ref_list, 0, sizeof(ref_list));
414 ref_list.kinds = kinds;
694a5775 415 ref_list.with_commit = with_commit;
68067ca1
JH
416 if (merge_filter != NO_FILTER)
417 init_revisions(&ref_list.revs, NULL);
bfcc9214 418 for_each_ref(append_ref, &ref_list);
68067ca1
JH
419 if (merge_filter != NO_FILTER) {
420 struct commit *filter;
421 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
422 filter->object.flags |= UNINTERESTING;
423 add_pending_object(&ref_list.revs,
424 (struct object *) filter, "");
425 ref_list.revs.limited = 1;
426 prepare_revision_walk(&ref_list.revs);
b6f637d1
LH
427 if (verbose)
428 ref_list.maxwidth = calc_maxwidth(&ref_list);
68067ca1 429 }
c31820c2 430
bfcc9214 431 qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
c31820c2 432
0016a482 433 detached = (detached && (kinds & REF_LOCAL_BRANCH));
7fcdb36e
JG
434 if (detached && head_commit &&
435 is_descendant_of(head_commit, with_commit)) {
0016a482 436 struct ref_item item;
3a55602e 437 item.name = xstrdup("(no branch)");
45e2b614 438 item.len = strlen(item.name);
0016a482 439 item.kind = REF_LOCAL_BRANCH;
45e2b614 440 item.dest = NULL;
68067ca1 441 item.commit = head_commit;
66648ad7
JK
442 if (item.len > ref_list.maxwidth)
443 ref_list.maxwidth = item.len;
209d336a 444 print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1, "");
3a55602e 445 free(item.name);
0016a482
LH
446 }
447
bfcc9214 448 for (i = 0; i < ref_list.index; i++) {
0016a482
LH
449 int current = !detached &&
450 (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
af0e4ac0 451 !strcmp(ref_list.list[i].name, head);
209d336a
JS
452 char *prefix = (kinds != REF_REMOTE_BRANCH &&
453 ref_list.list[i].kind == REF_REMOTE_BRANCH)
454 ? "remotes/" : "";
af0e4ac0 455 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
209d336a 456 abbrev, current, prefix);
c31820c2 457 }
bfcc9214
AP
458
459 free_ref_list(&ref_list);
c31820c2
LH
460}
461
c976d415
LH
462static void rename_branch(const char *oldname, const char *newname, int force)
463{
da3f78a2 464 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
c976d415 465 unsigned char sha1[20];
da3f78a2 466 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
c976d415 467
c847f537 468 if (!oldname)
3dff5379 469 die("cannot rename the current branch while not on any.");
c847f537 470
a2fab531 471 if (strbuf_check_branch_ref(&oldref, oldname))
03d3aada 472 die("Invalid branch name: '%s'", oldname);
c976d415 473
a2fab531 474 if (strbuf_check_branch_ref(&newref, newname))
03d3aada 475 die("Invalid branch name: '%s'", newname);
c976d415 476
da3f78a2 477 if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
03d3aada 478 die("A branch named '%s' already exists.", newref.buf + 11);
c976d415 479
da3f78a2
MV
480 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
481 oldref.buf, newref.buf);
678d0f4c 482
da3f78a2 483 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
c976d415 484 die("Branch rename failed");
da3f78a2 485 strbuf_release(&logmsg);
c976d415 486
8b5157e4 487 /* no need to pass logmsg here as HEAD didn't really move */
da3f78a2 488 if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
c976d415 489 die("Branch renamed to %s, but HEAD is not updated!", newname);
19eba151 490
da3f78a2
MV
491 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
492 strbuf_release(&oldref);
493 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
494 strbuf_release(&newref);
495 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
19eba151 496 die("Branch is renamed, but update of config-file failed");
da3f78a2
MV
497 strbuf_release(&oldsection);
498 strbuf_release(&newsection);
c976d415
LH
499}
500
049716b3
JH
501static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
502{
503 merge_filter = ((opt->long_name[0] == 'n')
504 ? SHOW_NOT_MERGED
505 : SHOW_MERGED);
506 if (unset)
507 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
508 if (!arg)
509 arg = "HEAD";
510 if (get_sha1(arg, merge_filter_ref))
511 die("malformed object name %s", arg);
512 return 0;
513}
514
c31820c2
LH
515int cmd_branch(int argc, const char **argv, const char *prefix)
516{
d11d44fa 517 int delete = 0, rename = 0, force_create = 0;
0016a482 518 int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
9ed36cfa
JS
519 int reflog = 0;
520 enum branch_track track;
d11d44fa 521 int kinds = REF_LOCAL_BRANCH;
694a5775 522 struct commit_list *with_commit = NULL;
a8dfd5ea
PH
523
524 struct option options[] = {
525 OPT_GROUP("Generic options"),
526 OPT__VERBOSE(&verbose),
9ed36cfa
JS
527 OPT_SET_INT( 0 , "track", &track, "set up tracking mode (see git-pull(1))",
528 BRANCH_TRACK_EXPLICIT),
a8dfd5ea 529 OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"),
d11d44fa
PH
530 OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
531 REF_REMOTE_BRANCH),
e84fb2ff
JH
532 {
533 OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
534 "print only branches that contain the commit",
535 PARSE_OPT_LASTARG_DEFAULT,
269defdf 536 parse_opt_with_commit, (intptr_t)"HEAD",
e84fb2ff 537 },
694a5775
JH
538 {
539 OPTION_CALLBACK, 0, "with", &with_commit, "commit",
540 "print only branches that contain the commit",
e84fb2ff 541 PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
269defdf 542 parse_opt_with_commit, (intptr_t) "HEAD",
694a5775 543 },
a8dfd5ea
PH
544 OPT__ABBREV(&abbrev),
545
546 OPT_GROUP("Specific git-branch actions:"),
d11d44fa
PH
547 OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
548 REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
549 OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
550 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
551 OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
552 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
553 OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
554 OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
049716b3
JH
555 {
556 OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
557 "commit", "print only not merged branches",
558 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
559 opt_parse_merge_filter, (intptr_t) "HEAD",
560 },
561 {
562 OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
563 "commit", "print only merged branches",
564 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
565 opt_parse_merge_filter, (intptr_t) "HEAD",
566 },
a8dfd5ea
PH
567 OPT_END(),
568 };
c31820c2 569
ef90d6d4 570 git_config(git_branch_config, NULL);
6b2f2d98
MK
571
572 if (branch_use_color == -1)
573 branch_use_color = git_use_color_default;
574
9ed36cfa 575 track = git_branch_track;
c976d415 576
078f8380 577 head = resolve_ref("HEAD", head_sha1, 0, NULL);
c31820c2
LH
578 if (!head)
579 die("Failed to resolve HEAD as a valid ref.");
078f8380 580 head = xstrdup(head);
0016a482
LH
581 if (!strcmp(head, "HEAD")) {
582 detached = 1;
a8dfd5ea 583 } else {
cc44c765 584 if (prefixcmp(head, "refs/heads/"))
0016a482
LH
585 die("HEAD not found below refs/heads!");
586 head += 11;
587 }
049716b3
JH
588 hashcpy(merge_filter_ref, head_sha1);
589
590 argc = parse_options(argc, argv, options, builtin_branch_usage, 0);
591 if (!!delete + !!rename + !!force_create > 1)
592 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
593
594 if (delete)
d11d44fa 595 return delete_branches(argc, argv, delete > 1, kinds);
a8dfd5ea 596 else if (argc == 0)
694a5775 597 print_ref_list(kinds, detached, verbose, abbrev, with_commit);
a8dfd5ea 598 else if (rename && (argc == 1))
d11d44fa 599 rename_branch(head, argv[0], rename > 1);
a8dfd5ea 600 else if (rename && (argc == 2))
d11d44fa 601 rename_branch(argv[0], argv[1], rename > 1);
a8dfd5ea 602 else if (argc <= 2)
e496c003 603 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
45994a1e 604 force_create, reflog, track);
c31820c2 605 else
a8dfd5ea 606 usage_with_options(builtin_branch_usage, options);
c31820c2
LH
607
608 return 0;
609}