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);
  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 (want_color(branch_use_color))
  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         const char **pattern;
 264         int ret;
 265 };
 266
 267 static int match_patterns(const char **pattern, const char *refname)
 268 {
 269         if (!*pattern)
 270                 return 1; /* no pattern always matches */
 271         while (*pattern) {
 272                 if (!fnmatch(*pattern, refname, 0))
 273                         return 1;
 274                 pattern++;
 275         }
 276         return 0;
 277 }
 278
 279 static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
 280 {
 281         struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
 282         struct ref_list *ref_list = cb->ref_list;
 283         struct ref_item *newitem;
 284         struct commit *commit;
 285         int kind, i;
 286         const char *prefix, *orig_refname = refname;
 287
 288         static struct {
 289                 int kind;
 290                 const char *prefix;
 291                 int pfxlen;
 292         } ref_kind[] = {
 293                 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
 294                 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
 295         };
 296
 297         /* Detect kind */
 298         for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
 299                 prefix = ref_kind[i].prefix;
 300                 if (strncmp(refname, prefix, ref_kind[i].pfxlen))
 301                         continue;
 302                 kind = ref_kind[i].kind;
 303                 refname += ref_kind[i].pfxlen;
 304                 break;
 305         }
 306         if (ARRAY_SIZE(ref_kind) <= i)
 307                 return 0;
 308
 309         /* Don't add types the caller doesn't want */
 310         if ((kind & ref_list->kinds) == 0)
 311                 return 0;
 312
 313         if (!match_patterns(cb->pattern, refname))
 314                 return 0;
 315
 316         commit = NULL;
 317         if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
 318                 commit = lookup_commit_reference_gently(sha1, 1);
 319                 if (!commit) {
 320                         cb->ret = error(_("branch '%s' does not point at a commit"), refname);
 321                         return 0;
 322                 }
 323
 324                 /* Filter with with_commit if specified */
 325                 if (!is_descendant_of(commit, ref_list->with_commit))
 326                         return 0;
 327
 328                 if (merge_filter != NO_FILTER)
 329                         add_pending_object(&ref_list->revs,
 330                                            (struct object *)commit, refname);
 331         }
 332
 333         ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc);
 334
 335         /* Record the new item */
 336         newitem = &(ref_list->list[ref_list->index++]);
 337         newitem->name = xstrdup(refname);
 338         newitem->kind = kind;
 339         newitem->commit = commit;
 340         newitem->len = strlen(refname);
 341         newitem->dest = resolve_symref(orig_refname, prefix);
 342         /* adjust for "remotes/" */
 343         if (newitem->kind == REF_REMOTE_BRANCH &&
 344             ref_list->kinds != REF_REMOTE_BRANCH)
 345                 newitem->len += 8;
 346         if (newitem->len > ref_list->maxwidth)
 347                 ref_list->maxwidth = newitem->len;
 348
 349         return 0;
 350 }
 351
 352 static void free_ref_list(struct ref_list *ref_list)
 353 {
 354         int i;
 355
 356         for (i = 0; i < ref_list->index; i++) {
 357                 free(ref_list->list[i].name);
 358                 free(ref_list->list[i].dest);
 359         }
 360         free(ref_list->list);
 361 }
 362
 363 static int ref_cmp(const void *r1, const void *r2)
 364 {
 365         struct ref_item *c1 = (struct ref_item *)(r1);
 366         struct ref_item *c2 = (struct ref_item *)(r2);
 367
 368         if (c1->kind != c2->kind)
 369                 return c1->kind - c2->kind;
 370         return strcmp(c1->name, c2->name);
 371 }
 372
 373 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
 374                 int show_upstream_ref)
 375 {
 376         int ours, theirs;
 377         struct branch *branch = branch_get(branch_name);
 378
 379         if (!stat_tracking_info(branch, &ours, &theirs)) {
 380                 if (branch && branch->merge && branch->merge[0]->dst &&
 381                     show_upstream_ref)
 382                         strbuf_addf(stat, "[%s] ",
 383                             shorten_unambiguous_ref(branch->merge[0]->dst, 0));
 384                 return;
 385         }
 386
 387         strbuf_addch(stat, '[');
 388         if (show_upstream_ref)
 389                 strbuf_addf(stat, "%s: ",
 390                         shorten_unambiguous_ref(branch->merge[0]->dst, 0));
 391         if (!ours)
 392                 strbuf_addf(stat, _("behind %d] "), theirs);
 393         else if (!theirs)
 394                 strbuf_addf(stat, _("ahead %d] "), ours);
 395         else
 396                 strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
 397 }
 398
 399 static int matches_merge_filter(struct commit *commit)
 400 {
 401         int is_merged;
 402
 403         if (merge_filter == NO_FILTER)
 404                 return 1;
 405
 406         is_merged = !!(commit->object.flags & UNINTERESTING);
 407         return (is_merged == (merge_filter == SHOW_MERGED));
 408 }
 409
 410 static void add_verbose_info(struct strbuf *out, struct ref_item *item,
 411                              int verbose, int abbrev)
 412 {
 413         struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
 414         const char *sub = " **** invalid ref ****";
 415         struct commit *commit = item->commit;
 416
 417         if (commit && !parse_commit(commit)) {
 418                 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
 419                 sub = subject.buf;
 420         }
 421
 422         if (item->kind == REF_LOCAL_BRANCH)
 423                 fill_tracking_info(&stat, item->name, verbose > 1);
 424
 425         strbuf_addf(out, " %s %s%s",
 426                 find_unique_abbrev(item->commit->object.sha1, abbrev),
 427                 stat.buf, sub);
 428         strbuf_release(&stat);
 429         strbuf_release(&subject);
 430 }
 431
 432 static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
 433                            int abbrev, int current, char *prefix)
 434 {
 435         char c;
 436         int color;
 437         struct commit *commit = item->commit;
 438         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
 439
 440         if (!matches_merge_filter(commit))
 441                 return;
 442
 443         switch (item->kind) {
 444         case REF_LOCAL_BRANCH:
 445                 color = BRANCH_COLOR_LOCAL;
 446                 break;
 447         case REF_REMOTE_BRANCH:
 448                 color = BRANCH_COLOR_REMOTE;
 449                 break;
 450         default:
 451                 color = BRANCH_COLOR_PLAIN;
 452                 break;
 453         }
 454
 455         c = ' ';
 456         if (current) {
 457                 c = '*';
 458                 color = BRANCH_COLOR_CURRENT;
 459         }
 460
 461         strbuf_addf(&name, "%s%s", prefix, item->name);
 462         if (verbose)
 463                 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
 464                             maxwidth, name.buf,
 465                             branch_get_color(BRANCH_COLOR_RESET));
 466         else
 467                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
 468                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
 469
 470         if (item->dest)
 471                 strbuf_addf(&out, " -> %s", item->dest);
 472         else if (verbose)
 473                 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
 474                 add_verbose_info(&out, item, verbose, abbrev);
 475         printf("%s\n", out.buf);
 476         strbuf_release(&name);
 477         strbuf_release(&out);
 478 }
 479
 480 static int calc_maxwidth(struct ref_list *refs)
 481 {
 482         int i, w = 0;
 483         for (i = 0; i < refs->index; i++) {
 484                 if (!matches_merge_filter(refs->list[i].commit))
 485                         continue;
 486                 if (refs->list[i].len > w)
 487                         w = refs->list[i].len;
 488         }
 489         return w;
 490 }
 491
 492
 493 static void show_detached(struct ref_list *ref_list)
 494 {
 495         struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
 496
 497         if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
 498                 struct ref_item item;
 499                 item.name = xstrdup(_("(no branch)"));
 500                 item.len = strlen(item.name);
 501                 item.kind = REF_LOCAL_BRANCH;
 502                 item.dest = NULL;
 503                 item.commit = head_commit;
 504                 if (item.len > ref_list->maxwidth)
 505                         ref_list->maxwidth = item.len;
 506                 print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, "");
 507                 free(item.name);
 508         }
 509 }
 510
 511 static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern)
 512 {
 513         int i;
 514         struct append_ref_cb cb;
 515         struct ref_list ref_list;
 516
 517         memset(&ref_list, 0, sizeof(ref_list));
 518         ref_list.kinds = kinds;
 519         ref_list.verbose = verbose;
 520         ref_list.abbrev = abbrev;
 521         ref_list.with_commit = with_commit;
 522         if (merge_filter != NO_FILTER)
 523                 init_revisions(&ref_list.revs, NULL);
 524         cb.ref_list = &ref_list;
 525         cb.pattern = pattern;
 526         cb.ret = 0;
 527         for_each_rawref(append_ref, &cb);
 528         if (merge_filter != NO_FILTER) {
 529                 struct commit *filter;
 530                 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
 531                 filter->object.flags |= UNINTERESTING;
 532                 add_pending_object(&ref_list.revs,
 533                                    (struct object *) filter, "");
 534                 ref_list.revs.limited = 1;
 535                 prepare_revision_walk(&ref_list.revs);
 536                 if (verbose)
 537                         ref_list.maxwidth = calc_maxwidth(&ref_list);
 538         }
 539
 540         qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
 541
 542         detached = (detached && (kinds & REF_LOCAL_BRANCH));
 543         if (detached && match_patterns(pattern, "HEAD"))
 544                 show_detached(&ref_list);
 545
 546         for (i = 0; i < ref_list.index; i++) {
 547                 int current = !detached &&
 548                         (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
 549                         !strcmp(ref_list.list[i].name, head);
 550                 char *prefix = (kinds != REF_REMOTE_BRANCH &&
 551                                 ref_list.list[i].kind == REF_REMOTE_BRANCH)
 552                                 ? "remotes/" : "";
 553                 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
 554                                abbrev, current, prefix);
 555         }
 556
 557         free_ref_list(&ref_list);
 558
 559         if (cb.ret)
 560                 error(_("some refs could not be read"));
 561
 562         return cb.ret;
 563 }
 564
 565 static void rename_branch(const char *oldname, const char *newname, int force)
 566 {
 567         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
 568         unsigned char sha1[20];
 569         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
 570         int recovery = 0;
 571
 572         if (!oldname)
 573                 die(_("cannot rename the current branch while not on any."));
 574
 575         if (strbuf_check_branch_ref(&oldref, oldname)) {
 576                 /*
 577                  * Bad name --- this could be an attempt to rename a
 578                  * ref that we used to allow to be created by accident.
 579                  */
 580                 if (resolve_ref(oldref.buf, sha1, 1, NULL))
 581                         recovery = 1;
 582                 else
 583                         die(_("Invalid branch name: '%s'"), oldname);
 584         }
 585
 586         validate_new_branchname(newname, &newref, force, 0);
 587
 588         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 589                  oldref.buf, newref.buf);
 590
 591         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
 592                 die(_("Branch rename failed"));
 593         strbuf_release(&logmsg);
 594
 595         if (recovery)
 596                 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
 597
 598         /* no need to pass logmsg here as HEAD didn't really move */
 599         if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
 600                 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
 601
 602         strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
 603         strbuf_release(&oldref);
 604         strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
 605         strbuf_release(&newref);
 606         if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
 607                 die(_("Branch is renamed, but update of config-file failed"));
 608         strbuf_release(&oldsection);
 609         strbuf_release(&newsection);
 610 }
 611
 612 static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
 613 {
 614         merge_filter = ((opt->long_name[0] == 'n')
 615                         ? SHOW_NOT_MERGED
 616                         : SHOW_MERGED);
 617         if (unset)
 618                 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
 619         if (!arg)
 620                 arg = "HEAD";
 621         if (get_sha1(arg, merge_filter_ref))
 622                 die(_("malformed object name %s"), arg);
 623         return 0;
 624 }
 625
 626 static const char edit_description[] = "BRANCH_DESCRIPTION";
 627
 628 static int edit_branch_description(const char *branch_name)
 629 {
 630         FILE *fp;
 631         int status;
 632         struct strbuf buf = STRBUF_INIT;
 633         struct strbuf name = STRBUF_INIT;
 634
 635         read_branch_desc(&buf, branch_name);
 636         if (!buf.len || buf.buf[buf.len-1] != '\n')
 637                 strbuf_addch(&buf, '\n');
 638         strbuf_addf(&buf,
 639                     "# Please edit the description for the branch\n"
 640                     "#   %s\n"
 641                     "# Lines starting with '#' will be stripped.\n",
 642                     branch_name);
 643         fp = fopen(git_path(edit_description), "w");
 644         if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) {
 645                 strbuf_release(&buf);
 646                 return error(_("could not write branch description template: %s\n"),
 647                              strerror(errno));
 648         }
 649         strbuf_reset(&buf);
 650         if (launch_editor(git_path(edit_description), &buf, NULL)) {
 651                 strbuf_release(&buf);
 652                 return -1;
 653         }
 654         stripspace(&buf, 1);
 655
 656         strbuf_addf(&name, "branch.%s.description", branch_name);
 657         status = git_config_set(name.buf, buf.buf);
 658         strbuf_release(&name);
 659         strbuf_release(&buf);
 660
 661         return status;
 662 }
 663
 664 int cmd_branch(int argc, const char **argv, const char *prefix)
 665 {
 666         int delete = 0, rename = 0, force_create = 0, list = 0;
 667         int verbose = 0, abbrev = -1, detached = 0;
 668         int reflog = 0, edit_description = 0;
 669         enum branch_track track;
 670         int kinds = REF_LOCAL_BRANCH;
 671         struct commit_list *with_commit = NULL;
 672
 673         struct option options[] = {
 674                 OPT_GROUP("Generic options"),
 675                 OPT__VERBOSE(&verbose,
 676                         "show hash and subject, give twice for upstream branch"),
 677                 OPT_SET_INT('t', "track",  &track, "set up tracking mode (see git-pull(1))",
 678                         BRANCH_TRACK_EXPLICIT),
 679                 OPT_SET_INT( 0, "set-upstream",  &track, "change upstream info",
 680                         BRANCH_TRACK_OVERRIDE),
 681                 OPT__COLOR(&branch_use_color, "use colored output"),
 682                 OPT_SET_INT('r', "remotes",     &kinds, "act on remote-tracking branches",
 683                         REF_REMOTE_BRANCH),
 684                 {
 685                         OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
 686                         "print only branches that contain the commit",
 687                         PARSE_OPT_LASTARG_DEFAULT,
 688                         parse_opt_with_commit, (intptr_t)"HEAD",
 689                 },
 690                 {
 691                         OPTION_CALLBACK, 0, "with", &with_commit, "commit",
 692                         "print only branches that contain the commit",
 693                         PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
 694                         parse_opt_with_commit, (intptr_t) "HEAD",
 695                 },
 696                 OPT__ABBREV(&abbrev),
 697
 698                 OPT_GROUP("Specific git-branch actions:"),
 699                 OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches",
 700                         REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
 701                 OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
 702                 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
 703                 OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1),
 704                 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
 705                 OPT_BOOLEAN(0, "list", &list, "list branch names"),
 706                 OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"),
 707                 OPT_BOOLEAN(0, "edit-description", &edit_description,
 708                             "edit the description for the branch"),
 709                 OPT__FORCE(&force_create, "force creation (when already exists)"),
 710                 {
 711                         OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
 712                         "commit", "print only not merged branches",
 713                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
 714                         opt_parse_merge_filter, (intptr_t) "HEAD",
 715                 },
 716                 {
 717                         OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
 718                         "commit", "print only merged branches",
 719                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
 720                         opt_parse_merge_filter, (intptr_t) "HEAD",
 721                 },
 722                 OPT_END(),
 723         };
 724
 725         if (argc == 2 && !strcmp(argv[1], "-h"))
 726                 usage_with_options(builtin_branch_usage, options);
 727
 728         git_config(git_branch_config, NULL);
 729
 730         track = git_branch_track;
 731
 732         head = resolve_ref("HEAD", head_sha1, 0, NULL);
 733         if (!head)
 734                 die(_("Failed to resolve HEAD as a valid ref."));
 735         head = xstrdup(head);
 736         if (!strcmp(head, "HEAD")) {
 737                 detached = 1;
 738         } else {
 739                 if (prefixcmp(head, "refs/heads/"))
 740                         die(_("HEAD not found below refs/heads!"));
 741                 head += 11;
 742         }
 743         hashcpy(merge_filter_ref, head_sha1);
 744
 745         argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
 746                              0);
 747
 748         if (!delete && !rename && !force_create && !edit_description && argc == 0)
 749                 list = 1;
 750
 751         if (!!delete + !!rename + !!force_create + !!list > 1)
 752                 usage_with_options(builtin_branch_usage, options);
 753
 754         if (abbrev == -1)
 755                 abbrev = DEFAULT_ABBREV;
 756
 757         if (delete)
 758                 return delete_branches(argc, argv, delete > 1, kinds);
 759         else if (list)
 760                 return print_ref_list(kinds, detached, verbose, abbrev,
 761                                       with_commit, argv);
 762         else if (edit_description) {
 763                 const char *branch_name;
 764                 if (detached)
 765                         die("Cannot give description to detached HEAD");
 766                 if (!argc)
 767                         branch_name = head;
 768                 else if (argc == 1)
 769                         branch_name = argv[0];
 770                 else
 771                         usage_with_options(builtin_branch_usage, options);
 772                 if (edit_branch_description(branch_name))
 773                         return 1;
 774         }
 775         else if (rename && (argc == 1))
 776                 rename_branch(head, argv[0], rename > 1);
 777         else if (rename && (argc == 2))
 778                 rename_branch(argv[0], argv[1], rename > 1);
 779         else if (argc <= 2) {
 780                 if (kinds != REF_LOCAL_BRANCH)
 781                         die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
 782                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
 783                               force_create, reflog, track);
 784         } else
 785                 usage_with_options(builtin_branch_usage, options);
 786
 787         return 0;
 788 }