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 been 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                 remote = "remote ";
 161                 force = 1;
 162                 break;
 163         case REF_LOCAL_BRANCH:
 164                 fmt = "refs/heads/%s";
 165                 remote = "";
 166                 break;
 167         default:
 168                 die("cannot use -a with -d");
 169         }
 170
 171         if (!force) {
 172                 head_rev = lookup_commit_reference(head_sha1);
 173                 if (!head_rev)
 174                         die("Couldn't look up commit object for HEAD");
 175         }
 176         for (i = 0; i < argc; i++, strbuf_release(&bname)) {
 177                 strbuf_branchname(&bname, argv[i]);
 178                 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
 179                         error("Cannot delete the branch '%s' "
 180                               "which you are currently on.", bname.buf);
 181                         ret = 1;
 182                         continue;
 183                 }
 184
 185                 free(name);
 186
 187                 name = xstrdup(mkpath(fmt, bname.buf));
 188                 if (!resolve_ref(name, sha1, 1, NULL)) {
 189                         error("%sbranch '%s' not found.",
 190                                         remote, bname.buf);
 191                         ret = 1;
 192                         continue;
 193                 }
 194
 195                 rev = lookup_commit_reference(sha1);
 196                 if (!rev) {
 197                         error("Couldn't look up commit object for '%s'", name);
 198                         ret = 1;
 199                         continue;
 200                 }
 201
 202                 if (!force && !branch_merged(kinds, bname.buf, rev, head_rev)) {
 203                         error("The branch '%s' is not fully merged.\n"
 204                               "If you are sure you want to delete it, "
 205                               "run 'git branch -D %s'.", bname.buf, bname.buf);
 206                         ret = 1;
 207                         continue;
 208                 }
 209
 210                 if (delete_ref(name, sha1, 0)) {
 211                         error("Error deleting %sbranch '%s'", remote,
 212                               bname.buf);
 213                         ret = 1;
 214                 } else {
 215                         struct strbuf buf = STRBUF_INIT;
 216                         printf("Deleted %sbranch %s (was %s).\n", remote,
 217                                bname.buf,
 218                                find_unique_abbrev(sha1, DEFAULT_ABBREV));
 219                         strbuf_addf(&buf, "branch.%s", bname.buf);
 220                         if (git_config_rename_section(buf.buf, NULL) < 0)
 221                                 warning("Update of config-file failed");
 222                         strbuf_release(&buf);
 223                 }
 224         }
 225
 226         free(name);
 227
 228         return(ret);
 229 }
 230
 231 struct ref_item {
 232         char *name;
 233         char *dest;
 234         unsigned int kind, len;
 235         struct commit *commit;
 236 };
 237
 238 struct ref_list {
 239         struct rev_info revs;
 240         int index, alloc, maxwidth, verbose, abbrev;
 241         struct ref_item *list;
 242         struct commit_list *with_commit;
 243         int kinds;
 244 };
 245
 246 static char *resolve_symref(const char *src, const char *prefix)
 247 {
 248         unsigned char sha1[20];
 249         int flag;
 250         const char *dst, *cp;
 251
 252         dst = resolve_ref(src, sha1, 0, &flag);
 253         if (!(dst && (flag & REF_ISSYMREF)))
 254                 return NULL;
 255         if (prefix && (cp = skip_prefix(dst, prefix)))
 256                 dst = cp;
 257         return xstrdup(dst);
 258 }
 259
 260 struct append_ref_cb {
 261         struct ref_list *ref_list;
 262         int ret;
 263 };
 264
 265 static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
 266 {
 267         struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
 268         struct ref_list *ref_list = cb->ref_list;
 269         struct ref_item *newitem;
 270         struct commit *commit;
 271         int kind, i;
 272         const char *prefix, *orig_refname = refname;
 273
 274         static struct {
 275                 int kind;
 276                 const char *prefix;
 277                 int pfxlen;
 278         } ref_kind[] = {
 279                 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
 280                 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
 281         };
 282
 283         /* Detect kind */
 284         for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
 285                 prefix = ref_kind[i].prefix;
 286                 if (strncmp(refname, prefix, ref_kind[i].pfxlen))
 287                         continue;
 288                 kind = ref_kind[i].kind;
 289                 refname += ref_kind[i].pfxlen;
 290                 break;
 291         }
 292         if (ARRAY_SIZE(ref_kind) <= i)
 293                 return 0;
 294
 295         /* Don't add types the caller doesn't want */
 296         if ((kind & ref_list->kinds) == 0)
 297                 return 0;
 298
 299         commit = NULL;
 300         if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
 301                 commit = lookup_commit_reference_gently(sha1, 1);
 302                 if (!commit) {
 303                         cb->ret = error("branch '%s' does not point at a commit", refname);
 304                         return 0;
 305                 }
 306
 307                 /* Filter with with_commit if specified */
 308                 if (!is_descendant_of(commit, ref_list->with_commit))
 309                         return 0;
 310
 311                 if (merge_filter != NO_FILTER)
 312                         add_pending_object(&ref_list->revs,
 313                                            (struct object *)commit, refname);
 314         }
 315
 316         ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc);
 317
 318         /* Record the new item */
 319         newitem = &(ref_list->list[ref_list->index++]);
 320         newitem->name = xstrdup(refname);
 321         newitem->kind = kind;
 322         newitem->commit = commit;
 323         newitem->len = strlen(refname);
 324         newitem->dest = resolve_symref(orig_refname, prefix);
 325         /* adjust for "remotes/" */
 326         if (newitem->kind == REF_REMOTE_BRANCH &&
 327             ref_list->kinds != REF_REMOTE_BRANCH)
 328                 newitem->len += 8;
 329         if (newitem->len > ref_list->maxwidth)
 330                 ref_list->maxwidth = newitem->len;
 331
 332         return 0;
 333 }
 334
 335 static void free_ref_list(struct ref_list *ref_list)
 336 {
 337         int i;
 338
 339         for (i = 0; i < ref_list->index; i++) {
 340                 free(ref_list->list[i].name);
 341                 free(ref_list->list[i].dest);
 342         }
 343         free(ref_list->list);
 344 }
 345
 346 static int ref_cmp(const void *r1, const void *r2)
 347 {
 348         struct ref_item *c1 = (struct ref_item *)(r1);
 349         struct ref_item *c2 = (struct ref_item *)(r2);
 350
 351         if (c1->kind != c2->kind)
 352                 return c1->kind - c2->kind;
 353         return strcmp(c1->name, c2->name);
 354 }
 355
 356 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
 357                 int show_upstream_ref)
 358 {
 359         int ours, theirs;
 360         struct branch *branch = branch_get(branch_name);
 361
 362         if (!stat_tracking_info(branch, &ours, &theirs)) {
 363                 if (branch && branch->merge && branch->merge[0]->dst &&
 364                     show_upstream_ref)
 365                         strbuf_addf(stat, "[%s] ",
 366                             shorten_unambiguous_ref(branch->merge[0]->dst, 0));
 367                 return;
 368         }
 369
 370         strbuf_addch(stat, '[');
 371         if (show_upstream_ref)
 372                 strbuf_addf(stat, "%s: ",
 373                         shorten_unambiguous_ref(branch->merge[0]->dst, 0));
 374         if (!ours)
 375                 strbuf_addf(stat, "behind %d] ", theirs);
 376         else if (!theirs)
 377                 strbuf_addf(stat, "ahead %d] ", ours);
 378         else
 379                 strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
 380 }
 381
 382 static int matches_merge_filter(struct commit *commit)
 383 {
 384         int is_merged;
 385
 386         if (merge_filter == NO_FILTER)
 387                 return 1;
 388
 389         is_merged = !!(commit->object.flags & UNINTERESTING);
 390         return (is_merged == (merge_filter == SHOW_MERGED));
 391 }
 392
 393 static void add_verbose_info(struct strbuf *out, struct ref_item *item,
 394                              int verbose, int abbrev)
 395 {
 396         struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
 397         const char *sub = " **** invalid ref ****";
 398         struct commit *commit = item->commit;
 399
 400         if (commit && !parse_commit(commit)) {
 401                 struct pretty_print_context ctx = {0};
 402                 pretty_print_commit(CMIT_FMT_ONELINE, commit,
 403                                     &subject, &ctx);
 404                 sub = subject.buf;
 405         }
 406
 407         if (item->kind == REF_LOCAL_BRANCH)
 408                 fill_tracking_info(&stat, item->name, verbose > 1);
 409
 410         strbuf_addf(out, " %s %s%s",
 411                 find_unique_abbrev(item->commit->object.sha1, abbrev),
 412                 stat.buf, sub);
 413         strbuf_release(&stat);
 414         strbuf_release(&subject);
 415 }
 416
 417 static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
 418                            int abbrev, int current, char *prefix)
 419 {
 420         char c;
 421         int color;
 422         struct commit *commit = item->commit;
 423         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
 424
 425         if (!matches_merge_filter(commit))
 426                 return;
 427
 428         switch (item->kind) {
 429         case REF_LOCAL_BRANCH:
 430                 color = BRANCH_COLOR_LOCAL;
 431                 break;
 432         case REF_REMOTE_BRANCH:
 433                 color = BRANCH_COLOR_REMOTE;
 434                 break;
 435         default:
 436                 color = BRANCH_COLOR_PLAIN;
 437                 break;
 438         }
 439
 440         c = ' ';
 441         if (current) {
 442                 c = '*';
 443                 color = BRANCH_COLOR_CURRENT;
 444         }
 445
 446         strbuf_addf(&name, "%s%s", prefix, item->name);
 447         if (verbose)
 448                 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
 449                             maxwidth, name.buf,
 450                             branch_get_color(BRANCH_COLOR_RESET));
 451         else
 452                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
 453                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
 454
 455         if (item->dest)
 456                 strbuf_addf(&out, " -> %s", item->dest);
 457         else if (verbose)
 458                 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
 459                 add_verbose_info(&out, item, verbose, abbrev);
 460         printf("%s\n", out.buf);
 461         strbuf_release(&name);
 462         strbuf_release(&out);
 463 }
 464
 465 static int calc_maxwidth(struct ref_list *refs)
 466 {
 467         int i, w = 0;
 468         for (i = 0; i < refs->index; i++) {
 469                 if (!matches_merge_filter(refs->list[i].commit))
 470                         continue;
 471                 if (refs->list[i].len > w)
 472                         w = refs->list[i].len;
 473         }
 474         return w;
 475 }
 476
 477
 478 static void show_detached(struct ref_list *ref_list)
 479 {
 480         struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
 481
 482         if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
 483                 struct ref_item item;
 484                 item.name = xstrdup("(no branch)");
 485                 item.len = strlen(item.name);
 486                 item.kind = REF_LOCAL_BRANCH;
 487                 item.dest = NULL;
 488                 item.commit = head_commit;
 489                 if (item.len > ref_list->maxwidth)
 490                         ref_list->maxwidth = item.len;
 491                 print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, "");
 492                 free(item.name);
 493         }
 494 }
 495
 496 static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
 497 {
 498         int i;
 499         struct append_ref_cb cb;
 500         struct ref_list ref_list;
 501
 502         memset(&ref_list, 0, sizeof(ref_list));
 503         ref_list.kinds = kinds;
 504         ref_list.verbose = verbose;
 505         ref_list.abbrev = abbrev;
 506         ref_list.with_commit = with_commit;
 507         if (merge_filter != NO_FILTER)
 508                 init_revisions(&ref_list.revs, NULL);
 509         cb.ref_list = &ref_list;
 510         cb.ret = 0;
 511         for_each_rawref(append_ref, &cb);
 512         if (merge_filter != NO_FILTER) {
 513                 struct commit *filter;
 514                 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
 515                 filter->object.flags |= UNINTERESTING;
 516                 add_pending_object(&ref_list.revs,
 517                                    (struct object *) filter, "");
 518                 ref_list.revs.limited = 1;
 519                 prepare_revision_walk(&ref_list.revs);
 520                 if (verbose)
 521                         ref_list.maxwidth = calc_maxwidth(&ref_list);
 522         }
 523
 524         qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
 525
 526         detached = (detached && (kinds & REF_LOCAL_BRANCH));
 527         if (detached)
 528                 show_detached(&ref_list);
 529
 530         for (i = 0; i < ref_list.index; i++) {
 531                 int current = !detached &&
 532                         (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
 533                         !strcmp(ref_list.list[i].name, head);
 534                 char *prefix = (kinds != REF_REMOTE_BRANCH &&
 535                                 ref_list.list[i].kind == REF_REMOTE_BRANCH)
 536                                 ? "remotes/" : "";
 537                 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
 538                                abbrev, current, prefix);
 539         }
 540
 541         free_ref_list(&ref_list);
 542
 543         if (cb.ret)
 544                 error("some refs could not be read");
 545
 546         return cb.ret;
 547 }
 548
 549 static void rename_branch(const char *oldname, const char *newname, int force)
 550 {
 551         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
 552         unsigned char sha1[20];
 553         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
 554         int recovery = 0;
 555
 556         if (!oldname)
 557                 die("cannot rename the current branch while not on any.");
 558
 559         if (strbuf_check_branch_ref(&oldref, oldname)) {
 560                 /*
 561                  * Bad name --- this could be an attempt to rename a
 562                  * ref that we used to allow to be created by accident.
 563                  */
 564                 if (resolve_ref(oldref.buf, sha1, 1, NULL))
 565                         recovery = 1;
 566                 else
 567                         die("Invalid branch name: '%s'", oldname);
 568         }
 569
 570         if (strbuf_check_branch_ref(&newref, newname))
 571                 die("Invalid branch name: '%s'", newname);
 572
 573         if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
 574                 die("A branch named '%s' already exists.", newref.buf + 11);
 575
 576         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 577                  oldref.buf, newref.buf);
 578
 579         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
 580                 die("Branch rename failed");
 581         strbuf_release(&logmsg);
 582
 583         if (recovery)
 584                 warning("Renamed a misnamed branch '%s' away", oldref.buf + 11);
 585
 586         /* no need to pass logmsg here as HEAD didn't really move */
 587         if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
 588                 die("Branch renamed to %s, but HEAD is not updated!", newname);
 589
 590         strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
 591         strbuf_release(&oldref);
 592         strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
 593         strbuf_release(&newref);
 594         if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
 595                 die("Branch is renamed, but update of config-file failed");
 596         strbuf_release(&oldsection);
 597         strbuf_release(&newsection);
 598 }
 599
 600 static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
 601 {
 602         merge_filter = ((opt->long_name[0] == 'n')
 603                         ? SHOW_NOT_MERGED
 604                         : SHOW_MERGED);
 605         if (unset)
 606                 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
 607         if (!arg)
 608                 arg = "HEAD";
 609         if (get_sha1(arg, merge_filter_ref))
 610                 die("malformed object name %s", arg);
 611         return 0;
 612 }
 613
 614 int cmd_branch(int argc, const char **argv, const char *prefix)
 615 {
 616         int delete = 0, rename = 0, force_create = 0;
 617         int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
 618         int reflog = 0;
 619         enum branch_track track;
 620         int kinds = REF_LOCAL_BRANCH;
 621         struct commit_list *with_commit = NULL;
 622
 623         struct option options[] = {
 624                 OPT_GROUP("Generic options"),
 625                 OPT__VERBOSE(&verbose,
 626                         "show hash and subject, give twice for upstream branch"),
 627                 OPT_SET_INT('t', "track",  &track, "set up tracking mode (see git-pull(1))",
 628                         BRANCH_TRACK_EXPLICIT),
 629                 OPT_SET_INT( 0, "set-upstream",  &track, "change upstream info",
 630                         BRANCH_TRACK_OVERRIDE),
 631                 OPT__COLOR(&branch_use_color, "use colored output"),
 632                 OPT_SET_INT('r', NULL,     &kinds, "act on remote-tracking branches",
 633                         REF_REMOTE_BRANCH),
 634                 {
 635                         OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
 636                         "print only branches that contain the commit",
 637                         PARSE_OPT_LASTARG_DEFAULT,
 638                         parse_opt_with_commit, (intptr_t)"HEAD",
 639                 },
 640                 {
 641                         OPTION_CALLBACK, 0, "with", &with_commit, "commit",
 642                         "print only branches that contain the commit",
 643                         PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
 644                         parse_opt_with_commit, (intptr_t) "HEAD",
 645                 },
 646                 OPT__ABBREV(&abbrev),
 647
 648                 OPT_GROUP("Specific git-branch actions:"),
 649                 OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
 650                         REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
 651                 OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
 652                 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
 653                 OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
 654                 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
 655                 OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
 656                 OPT__FORCE(&force_create, "force creation (when already exists)"),
 657                 {
 658                         OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
 659                         "commit", "print only not merged branches",
 660                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
 661                         opt_parse_merge_filter, (intptr_t) "HEAD",
 662                 },
 663                 {
 664                         OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
 665                         "commit", "print only merged branches",
 666                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
 667                         opt_parse_merge_filter, (intptr_t) "HEAD",
 668                 },
 669                 OPT_END(),
 670         };
 671
 672         if (argc == 2 && !strcmp(argv[1], "-h"))
 673                 usage_with_options(builtin_branch_usage, options);
 674
 675         git_config(git_branch_config, NULL);
 676
 677         if (branch_use_color == -1)
 678                 branch_use_color = git_use_color_default;
 679
 680         track = git_branch_track;
 681
 682         head = resolve_ref("HEAD", head_sha1, 0, NULL);
 683         if (!head)
 684                 die("Failed to resolve HEAD as a valid ref.");
 685         head = xstrdup(head);
 686         if (!strcmp(head, "HEAD")) {
 687                 detached = 1;
 688         } else {
 689                 if (prefixcmp(head, "refs/heads/"))
 690                         die("HEAD not found below refs/heads!");
 691                 head += 11;
 692         }
 693         hashcpy(merge_filter_ref, head_sha1);
 694
 695         argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
 696                              0);
 697         if (!!delete + !!rename + !!force_create > 1)
 698                 usage_with_options(builtin_branch_usage, options);
 699
 700         if (delete)
 701                 return delete_branches(argc, argv, delete > 1, kinds);
 702         else if (argc == 0)
 703                 return print_ref_list(kinds, detached, verbose, abbrev, with_commit);
 704         else if (rename && (argc == 1))
 705                 rename_branch(head, argv[0], rename > 1);
 706         else if (rename && (argc == 2))
 707                 rename_branch(argv[0], argv[1], rename > 1);
 708         else if (argc <= 2) {
 709                 if (kinds != REF_LOCAL_BRANCH)
 710                         die("-a and -r options to 'git branch' do not make sense with a branch name");
 711                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
 712                               force_create, reflog, track);
 713         } else
 714                 usage_with_options(builtin_branch_usage, options);
 715
 716         return 0;
 717 }