Merge branch 'maint'
[git] / builtin / branch.c
1 /*
2  * Builtin "git branch"
3  *
4  * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
5  * Based on git-branch.sh by Junio C Hamano.
6  */
7
8 #include "cache.h"
9 #include "color.h"
10 #include "refs.h"
11 #include "commit.h"
12 #include "builtin.h"
13 #include "remote.h"
14 #include "parse-options.h"
15 #include "branch.h"
16 #include "diff.h"
17 #include "revision.h"
18
19 static const char * const builtin_branch_usage[] = {
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>",
24         NULL
25 };
26
27 #define REF_LOCAL_BRANCH    0x01
28 #define REF_REMOTE_BRANCH   0x02
29
30 static const char *head;
31 static unsigned char head_sha1[20];
32
33 static int branch_use_color = -1;
34 static char branch_colors[][COLOR_MAXLEN] = {
35         GIT_COLOR_RESET,
36         GIT_COLOR_NORMAL,       /* PLAIN */
37         GIT_COLOR_RED,          /* REMOTE */
38         GIT_COLOR_NORMAL,       /* LOCAL */
39         GIT_COLOR_GREEN,        /* CURRENT */
40 };
41 enum color_branch {
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
47 };
48
49 static enum merge_filter {
50         NO_FILTER = 0,
51         SHOW_NOT_MERGED,
52         SHOW_MERGED
53 } merge_filter;
54 static unsigned char merge_filter_ref[20];
55
56 static int parse_branch_color_slot(const char *var, int ofs)
57 {
58         if (!strcasecmp(var+ofs, "plain"))
59                 return BRANCH_COLOR_PLAIN;
60         if (!strcasecmp(var+ofs, "reset"))
61                 return BRANCH_COLOR_RESET;
62         if (!strcasecmp(var+ofs, "remote"))
63                 return BRANCH_COLOR_REMOTE;
64         if (!strcasecmp(var+ofs, "local"))
65                 return BRANCH_COLOR_LOCAL;
66         if (!strcasecmp(var+ofs, "current"))
67                 return BRANCH_COLOR_CURRENT;
68         return -1;
69 }
70
71 static int git_branch_config(const char *var, const char *value, void *cb)
72 {
73         if (!strcmp(var, "color.branch")) {
74                 branch_use_color = git_config_colorbool(var, value, -1);
75                 return 0;
76         }
77         if (!prefixcmp(var, "color.branch.")) {
78                 int slot = parse_branch_color_slot(var, 13);
79                 if (slot < 0)
80                         return 0;
81                 if (!value)
82                         return config_error_nonbool(var);
83                 color_parse(value, var, branch_colors[slot]);
84                 return 0;
85         }
86         return git_color_default_config(var, value, cb);
87 }
88
89 static const char *branch_get_color(enum color_branch ix)
90 {
91         if (branch_use_color > 0)
92                 return branch_colors[ix];
93         return "";
94 }
95
96 static 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)
136                         warning(_("deleting branch '%s' that has been merged to\n"
137                                 "         '%s', but not yet merged to HEAD."),
138                                 name, reference_name);
139                 else
140                         warning(_("not deleting branch '%s' that is not yet merged to\n"
141                                 "         '%s', even though it is merged to HEAD."),
142                                 name, reference_name);
143         }
144         return merged;
145 }
146
147 static int delete_branches(int argc, const char **argv, int force, int kinds)
148 {
149         struct commit *rev, *head_rev = NULL;
150         unsigned char sha1[20];
151         char *name = NULL;
152         const char *fmt, *remote;
153         int i;
154         int ret = 0;
155         struct strbuf bname = STRBUF_INIT;
156
157         switch (kinds) {
158         case REF_REMOTE_BRANCH:
159                 fmt = "refs/remotes/%s";
160                 /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */
161                 remote = _("remote ");
162                 force = 1;
163                 break;
164         case REF_LOCAL_BRANCH:
165                 fmt = "refs/heads/%s";
166                 remote = "";
167                 break;
168         default:
169                 die(_("cannot use -a with -d"));
170         }
171
172         if (!force) {
173                 head_rev = lookup_commit_reference(head_sha1);
174                 if (!head_rev)
175                         die(_("Couldn't look up commit object for HEAD"));
176         }
177         for (i = 0; i < argc; i++, strbuf_release(&bname)) {
178                 strbuf_branchname(&bname, argv[i]);
179                 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
180                         error(_("Cannot delete the branch '%s' "
181                               "which you are currently on."), bname.buf);
182                         ret = 1;
183                         continue;
184                 }
185
186                 free(name);
187
188                 name = xstrdup(mkpath(fmt, bname.buf));
189                 if (!resolve_ref(name, sha1, 1, NULL)) {
190                         error(_("%sbranch '%s' not found."),
191                                         remote, bname.buf);
192                         ret = 1;
193                         continue;
194                 }
195
196                 rev = lookup_commit_reference(sha1);
197                 if (!rev) {
198                         error(_("Couldn't look up commit object for '%s'"), name);
199                         ret = 1;
200                         continue;
201                 }
202
203                 if (!force && !branch_merged(kinds, bname.buf, rev, head_rev)) {
204                         error(_("The branch '%s' is not fully merged.\n"
205                               "If you are sure you want to delete it, "
206                               "run 'git branch -D %s'."), bname.buf, bname.buf);
207                         ret = 1;
208                         continue;
209                 }
210
211                 if (delete_ref(name, sha1, 0)) {
212                         error(_("Error deleting %sbranch '%s'"), remote,
213                               bname.buf);
214                         ret = 1;
215                 } else {
216                         struct strbuf buf = STRBUF_INIT;
217                         printf(_("Deleted %sbranch %s (was %s).\n"), remote,
218                                bname.buf,
219                                find_unique_abbrev(sha1, DEFAULT_ABBREV));
220                         strbuf_addf(&buf, "branch.%s", bname.buf);
221                         if (git_config_rename_section(buf.buf, NULL) < 0)
222                                 warning(_("Update of config-file failed"));
223                         strbuf_release(&buf);
224                 }
225         }
226
227         free(name);
228
229         return(ret);
230 }
231
232 struct ref_item {
233         char *name;
234         char *dest;
235         unsigned int kind, len;
236         struct commit *commit;
237 };
238
239 struct ref_list {
240         struct rev_info revs;
241         int index, alloc, maxwidth, verbose, abbrev;
242         struct ref_item *list;
243         struct commit_list *with_commit;
244         int kinds;
245 };
246
247 static 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
261 struct append_ref_cb {
262         struct ref_list *ref_list;
263         int ret;
264 };
265
266 static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
267 {
268         struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
269         struct ref_list *ref_list = cb->ref_list;
270         struct ref_item *newitem;
271         struct commit *commit;
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         };
283
284         /* Detect kind */
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)
294                 return 0;
295
296         /* Don't add types the caller doesn't want */
297         if ((kind & ref_list->kinds) == 0)
298                 return 0;
299
300         commit = NULL;
301         if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
302                 commit = lookup_commit_reference_gently(sha1, 1);
303                 if (!commit) {
304                         cb->ret = error(_("branch '%s' does not point at a commit"), refname);
305                         return 0;
306                 }
307
308                 /* Filter with with_commit if specified */
309                 if (!is_descendant_of(commit, ref_list->with_commit))
310                         return 0;
311
312                 if (merge_filter != NO_FILTER)
313                         add_pending_object(&ref_list->revs,
314                                            (struct object *)commit, refname);
315         }
316
317         ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc);
318
319         /* Record the new item */
320         newitem = &(ref_list->list[ref_list->index++]);
321         newitem->name = xstrdup(refname);
322         newitem->kind = kind;
323         newitem->commit = commit;
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;
332
333         return 0;
334 }
335
336 static void free_ref_list(struct ref_list *ref_list)
337 {
338         int i;
339
340         for (i = 0; i < ref_list->index; i++) {
341                 free(ref_list->list[i].name);
342                 free(ref_list->list[i].dest);
343         }
344         free(ref_list->list);
345 }
346
347 static int ref_cmp(const void *r1, const void *r2)
348 {
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);
355 }
356
357 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
358                 int show_upstream_ref)
359 {
360         int ours, theirs;
361         struct branch *branch = branch_get(branch_name);
362
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] ",
367                             shorten_unambiguous_ref(branch->merge[0]->dst, 0));
368                 return;
369         }
370
371         strbuf_addch(stat, '[');
372         if (show_upstream_ref)
373                 strbuf_addf(stat, "%s: ",
374                         shorten_unambiguous_ref(branch->merge[0]->dst, 0));
375         if (!ours)
376                 strbuf_addf(stat, _("behind %d] "), theirs);
377         else if (!theirs)
378                 strbuf_addf(stat, _("ahead %d] "), ours);
379         else
380                 strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
381 }
382
383 static 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
394 static 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)) {
402                 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
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
416 static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
417                            int abbrev, int current, char *prefix)
418 {
419         char c;
420         int color;
421         struct commit *commit = item->commit;
422         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
423
424         if (!matches_merge_filter(commit))
425                 return;
426
427         switch (item->kind) {
428         case REF_LOCAL_BRANCH:
429                 color = BRANCH_COLOR_LOCAL;
430                 break;
431         case REF_REMOTE_BRANCH:
432                 color = BRANCH_COLOR_REMOTE;
433                 break;
434         default:
435                 color = BRANCH_COLOR_PLAIN;
436                 break;
437         }
438
439         c = ' ';
440         if (current) {
441                 c = '*';
442                 color = BRANCH_COLOR_CURRENT;
443         }
444
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,
449                             branch_get_color(BRANCH_COLOR_RESET));
450         else
451                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
452                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
453
454         if (item->dest)
455                 strbuf_addf(&out, " -> %s", item->dest);
456         else if (verbose)
457                 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
458                 add_verbose_info(&out, item, verbose, abbrev);
459         printf("%s\n", out.buf);
460         strbuf_release(&name);
461         strbuf_release(&out);
462 }
463
464 static int calc_maxwidth(struct ref_list *refs)
465 {
466         int i, w = 0;
467         for (i = 0; i < refs->index; i++) {
468                 if (!matches_merge_filter(refs->list[i].commit))
469                         continue;
470                 if (refs->list[i].len > w)
471                         w = refs->list[i].len;
472         }
473         return w;
474 }
475
476
477 static 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;
483                 item.name = xstrdup(_("(no branch)"));
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
495 static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
496 {
497         int i;
498         struct append_ref_cb cb;
499         struct ref_list ref_list;
500
501         memset(&ref_list, 0, sizeof(ref_list));
502         ref_list.kinds = kinds;
503         ref_list.verbose = verbose;
504         ref_list.abbrev = abbrev;
505         ref_list.with_commit = with_commit;
506         if (merge_filter != NO_FILTER)
507                 init_revisions(&ref_list.revs, NULL);
508         cb.ref_list = &ref_list;
509         cb.ret = 0;
510         for_each_rawref(append_ref, &cb);
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);
519                 if (verbose)
520                         ref_list.maxwidth = calc_maxwidth(&ref_list);
521         }
522
523         qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
524
525         detached = (detached && (kinds & REF_LOCAL_BRANCH));
526         if (detached)
527                 show_detached(&ref_list);
528
529         for (i = 0; i < ref_list.index; i++) {
530                 int current = !detached &&
531                         (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
532                         !strcmp(ref_list.list[i].name, head);
533                 char *prefix = (kinds != REF_REMOTE_BRANCH &&
534                                 ref_list.list[i].kind == REF_REMOTE_BRANCH)
535                                 ? "remotes/" : "";
536                 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
537                                abbrev, current, prefix);
538         }
539
540         free_ref_list(&ref_list);
541
542         if (cb.ret)
543                 error(_("some refs could not be read"));
544
545         return cb.ret;
546 }
547
548 static void rename_branch(const char *oldname, const char *newname, int force)
549 {
550         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
551         unsigned char sha1[20];
552         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
553         int recovery = 0;
554
555         if (!oldname)
556                 die(_("cannot rename the current branch while not on any."));
557
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
566                         die(_("Invalid branch name: '%s'"), oldname);
567         }
568
569         if (strbuf_check_branch_ref(&newref, newname))
570                 die(_("Invalid branch name: '%s'"), newname);
571
572         if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
573                 die(_("A branch named '%s' already exists."), newref.buf + 11);
574
575         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
576                  oldref.buf, newref.buf);
577
578         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
579                 die(_("Branch rename failed"));
580         strbuf_release(&logmsg);
581
582         if (recovery)
583                 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
584
585         /* no need to pass logmsg here as HEAD didn't really move */
586         if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
587                 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
588
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)
594                 die(_("Branch is renamed, but update of config-file failed"));
595         strbuf_release(&oldsection);
596         strbuf_release(&newsection);
597 }
598
599 static 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))
609                 die(_("malformed object name %s"), arg);
610         return 0;
611 }
612
613 int cmd_branch(int argc, const char **argv, const char *prefix)
614 {
615         int delete = 0, rename = 0, force_create = 0;
616         int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
617         int reflog = 0;
618         enum branch_track track;
619         int kinds = REF_LOCAL_BRANCH;
620         struct commit_list *with_commit = NULL;
621
622         struct option options[] = {
623                 OPT_GROUP("Generic options"),
624                 OPT__VERBOSE(&verbose,
625                         "show hash and subject, give twice for upstream branch"),
626                 OPT_SET_INT('t', "track",  &track, "set up tracking mode (see git-pull(1))",
627                         BRANCH_TRACK_EXPLICIT),
628                 OPT_SET_INT( 0, "set-upstream",  &track, "change upstream info",
629                         BRANCH_TRACK_OVERRIDE),
630                 OPT__COLOR(&branch_use_color, "use colored output"),
631                 OPT_SET_INT('r', NULL,     &kinds, "act on remote-tracking branches",
632                         REF_REMOTE_BRANCH),
633                 {
634                         OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
635                         "print only branches that contain the commit",
636                         PARSE_OPT_LASTARG_DEFAULT,
637                         parse_opt_with_commit, (intptr_t)"HEAD",
638                 },
639                 {
640                         OPTION_CALLBACK, 0, "with", &with_commit, "commit",
641                         "print only branches that contain the commit",
642                         PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
643                         parse_opt_with_commit, (intptr_t) "HEAD",
644                 },
645                 OPT__ABBREV(&abbrev),
646
647                 OPT_GROUP("Specific git-branch actions:"),
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"),
655                 OPT__FORCE(&force_create, "force creation (when already exists)"),
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                 },
668                 OPT_END(),
669         };
670
671         if (argc == 2 && !strcmp(argv[1], "-h"))
672                 usage_with_options(builtin_branch_usage, options);
673
674         git_config(git_branch_config, NULL);
675
676         if (branch_use_color == -1)
677                 branch_use_color = git_use_color_default;
678
679         track = git_branch_track;
680
681         head = resolve_ref("HEAD", head_sha1, 0, NULL);
682         if (!head)
683                 die(_("Failed to resolve HEAD as a valid ref."));
684         head = xstrdup(head);
685         if (!strcmp(head, "HEAD")) {
686                 detached = 1;
687         } else {
688                 if (prefixcmp(head, "refs/heads/"))
689                         die(_("HEAD not found below refs/heads!"));
690                 head += 11;
691         }
692         hashcpy(merge_filter_ref, head_sha1);
693
694         argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
695                              0);
696         if (!!delete + !!rename + !!force_create > 1)
697                 usage_with_options(builtin_branch_usage, options);
698
699         if (delete)
700                 return delete_branches(argc, argv, delete > 1, kinds);
701         else if (argc == 0)
702                 return print_ref_list(kinds, detached, verbose, abbrev, with_commit);
703         else if (rename && (argc == 1))
704                 rename_branch(head, argv[0], rename > 1);
705         else if (rename && (argc == 2))
706                 rename_branch(argv[0], argv[1], rename > 1);
707         else if (argc <= 2) {
708                 if (kinds != REF_LOCAL_BRANCH)
709                         die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
710                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
711                               force_create, reflog, track);
712         } else
713                 usage_with_options(builtin_branch_usage, options);
714
715         return 0;
716 }