git.oblomov.eu Git - git/blob - 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 #include "string-list.h"
  19 #include "column.h"
  20 #include "utf8.h"
  21 #include "wt-status.h"
  22
  23 static const char * const builtin_branch_usage[] = {
  24         N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
  25         N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
  26         N_("git branch [options] [-r] (-d | -D) <branchname>..."),
  27         N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
  28         NULL
  29 };
  30
  31 #define REF_LOCAL_BRANCH    0x01
  32 #define REF_REMOTE_BRANCH   0x02
  33
  34 static const char *head;
  35 static unsigned char head_sha1[20];
  36
  37 static int branch_use_color = -1;
  38 static char branch_colors[][COLOR_MAXLEN] = {
  39         GIT_COLOR_RESET,
  40         GIT_COLOR_NORMAL,       /* PLAIN */
  41         GIT_COLOR_RED,          /* REMOTE */
  42         GIT_COLOR_NORMAL,       /* LOCAL */
  43         GIT_COLOR_GREEN,        /* CURRENT */
  44         GIT_COLOR_BLUE,         /* UPSTREAM */
  45 };
  46 enum color_branch {
  47         BRANCH_COLOR_RESET = 0,
  48         BRANCH_COLOR_PLAIN = 1,
  49         BRANCH_COLOR_REMOTE = 2,
  50         BRANCH_COLOR_LOCAL = 3,
  51         BRANCH_COLOR_CURRENT = 4,
  52         BRANCH_COLOR_UPSTREAM = 5
  53 };
  54
  55 static enum merge_filter {
  56         NO_FILTER = 0,
  57         SHOW_NOT_MERGED,
  58         SHOW_MERGED
  59 } merge_filter;
  60 static unsigned char merge_filter_ref[20];
  61
  62 static struct string_list output = STRING_LIST_INIT_DUP;
  63 static unsigned int colopts;
  64
  65 static int parse_branch_color_slot(const char *var, int ofs)
  66 {
  67         if (!strcasecmp(var+ofs, "plain"))
  68                 return BRANCH_COLOR_PLAIN;
  69         if (!strcasecmp(var+ofs, "reset"))
  70                 return BRANCH_COLOR_RESET;
  71         if (!strcasecmp(var+ofs, "remote"))
  72                 return BRANCH_COLOR_REMOTE;
  73         if (!strcasecmp(var+ofs, "local"))
  74                 return BRANCH_COLOR_LOCAL;
  75         if (!strcasecmp(var+ofs, "current"))
  76                 return BRANCH_COLOR_CURRENT;
  77         if (!strcasecmp(var+ofs, "upstream"))
  78                 return BRANCH_COLOR_UPSTREAM;
  79         return -1;
  80 }
  81
  82 static int git_branch_config(const char *var, const char *value, void *cb)
  83 {
  84         const char *slot_name;
  85
  86         if (starts_with(var, "column."))
  87                 return git_column_config(var, value, "branch", &colopts);
  88         if (!strcmp(var, "color.branch")) {
  89                 branch_use_color = git_config_colorbool(var, value);
  90                 return 0;
  91         }
  92         if (skip_prefix(var, "color.branch.", &slot_name)) {
  93                 int slot = parse_branch_color_slot(var, slot_name - var);
  94                 if (slot < 0)
  95                         return 0;
  96                 if (!value)
  97                         return config_error_nonbool(var);
  98                 color_parse(value, var, branch_colors[slot]);
  99                 return 0;
 100         }
 101         return git_color_default_config(var, value, cb);
 102 }
 103
 104 static const char *branch_get_color(enum color_branch ix)
 105 {
 106         if (want_color(branch_use_color))
 107                 return branch_colors[ix];
 108         return "";
 109 }
 110
 111 static int branch_merged(int kind, const char *name,
 112                          struct commit *rev, struct commit *head_rev)
 113 {
 114         /*
 115          * This checks whether the merge bases of branch and HEAD (or
 116          * the other branch this branch builds upon) contains the
 117          * branch, which means that the branch has already been merged
 118          * safely to HEAD (or the other branch).
 119          */
 120         struct commit *reference_rev = NULL;
 121         const char *reference_name = NULL;
 122         void *reference_name_to_free = NULL;
 123         int merged;
 124
 125         if (kind == REF_LOCAL_BRANCH) {
 126                 struct branch *branch = branch_get(name);
 127                 unsigned char sha1[20];
 128
 129                 if (branch &&
 130                     branch->merge &&
 131                     branch->merge[0] &&
 132                     branch->merge[0]->dst &&
 133                     (reference_name = reference_name_to_free =
 134                      resolve_refdup(branch->merge[0]->dst, RESOLVE_REF_READING,
 135                                     sha1, NULL)) != NULL)
 136                         reference_rev = lookup_commit_reference(sha1);
 137         }
 138         if (!reference_rev)
 139                 reference_rev = head_rev;
 140
 141         merged = in_merge_bases(rev, reference_rev);
 142
 143         /*
 144          * After the safety valve is fully redefined to "check with
 145          * upstream, if any, otherwise with HEAD", we should just
 146          * return the result of the in_merge_bases() above without
 147          * any of the following code, but during the transition period,
 148          * a gentle reminder is in order.
 149          */
 150         if ((head_rev != reference_rev) &&
 151             in_merge_bases(rev, head_rev) != merged) {
 152                 if (merged)
 153                         warning(_("deleting branch '%s' that has been merged to\n"
 154                                 "         '%s', but not yet merged to HEAD."),
 155                                 name, reference_name);
 156                 else
 157                         warning(_("not deleting branch '%s' that is not yet merged to\n"
 158                                 "         '%s', even though it is merged to HEAD."),
 159                                 name, reference_name);
 160         }
 161         free(reference_name_to_free);
 162         return merged;
 163 }
 164
 165 static int check_branch_commit(const char *branchname, const char *refname,
 166                                unsigned char *sha1, struct commit *head_rev,
 167                                int kinds, int force)
 168 {
 169         struct commit *rev = lookup_commit_reference(sha1);
 170         if (!rev) {
 171                 error(_("Couldn't look up commit object for '%s'"), refname);
 172                 return -1;
 173         }
 174         if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
 175                 error(_("The branch '%s' is not fully merged.\n"
 176                       "If you are sure you want to delete it, "
 177                       "run 'git branch -D %s'."), branchname, branchname);
 178                 return -1;
 179         }
 180         return 0;
 181 }
 182
 183 static void delete_branch_config(const char *branchname)
 184 {
 185         struct strbuf buf = STRBUF_INIT;
 186         strbuf_addf(&buf, "branch.%s", branchname);
 187         if (git_config_rename_section(buf.buf, NULL) < 0)
 188                 warning(_("Update of config-file failed"));
 189         strbuf_release(&buf);
 190 }
 191
 192 static int delete_branches(int argc, const char **argv, int force, int kinds,
 193                            int quiet)
 194 {
 195         struct commit *head_rev = NULL;
 196         unsigned char sha1[20];
 197         char *name = NULL;
 198         const char *fmt;
 199         int i;
 200         int ret = 0;
 201         int remote_branch = 0;
 202         struct strbuf bname = STRBUF_INIT;
 203
 204         switch (kinds) {
 205         case REF_REMOTE_BRANCH:
 206                 fmt = "refs/remotes/%s";
 207                 /* For subsequent UI messages */
 208                 remote_branch = 1;
 209
 210                 force = 1;
 211                 break;
 212         case REF_LOCAL_BRANCH:
 213                 fmt = "refs/heads/%s";
 214                 break;
 215         default:
 216                 die(_("cannot use -a with -d"));
 217         }
 218
 219         if (!force) {
 220                 head_rev = lookup_commit_reference(head_sha1);
 221                 if (!head_rev)
 222                         die(_("Couldn't look up commit object for HEAD"));
 223         }
 224         for (i = 0; i < argc; i++, strbuf_release(&bname)) {
 225                 const char *target;
 226                 int flags = 0;
 227
 228                 strbuf_branchname(&bname, argv[i]);
 229                 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
 230                         error(_("Cannot delete the branch '%s' "
 231                               "which you are currently on."), bname.buf);
 232                         ret = 1;
 233                         continue;
 234                 }
 235
 236                 free(name);
 237
 238                 name = mkpathdup(fmt, bname.buf);
 239                 target = resolve_ref_unsafe(name, RESOLVE_REF_NO_RECURSE,
 240                                             sha1, &flags);
 241                 if (!target ||
 242                     (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) {
 243                         error(remote_branch
 244                               ? _("remote branch '%s' not found.")
 245                               : _("branch '%s' not found."), bname.buf);
 246                         ret = 1;
 247                         continue;
 248                 }
 249
 250                 if (!(flags & REF_ISSYMREF) &&
 251                     check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
 252                                         force)) {
 253                         ret = 1;
 254                         continue;
 255                 }
 256
 257                 if (delete_ref(name, sha1, REF_NODEREF)) {
 258                         error(remote_branch
 259                               ? _("Error deleting remote branch '%s'")
 260                               : _("Error deleting branch '%s'"),
 261                               bname.buf);
 262                         ret = 1;
 263                         continue;
 264                 }
 265                 if (!quiet) {
 266                         printf(remote_branch
 267                                ? _("Deleted remote branch %s (was %s).\n")
 268                                : _("Deleted branch %s (was %s).\n"),
 269                                bname.buf,
 270                                (flags & REF_ISSYMREF)
 271                                ? target
 272                                : find_unique_abbrev(sha1, DEFAULT_ABBREV));
 273                 }
 274                 delete_branch_config(bname.buf);
 275         }
 276
 277         free(name);
 278
 279         return(ret);
 280 }
 281
 282 struct ref_item {
 283         char *name;
 284         char *dest;
 285         unsigned int kind, width;
 286         struct commit *commit;
 287         int ignore;
 288 };
 289
 290 struct ref_list {
 291         struct rev_info revs;
 292         int index, alloc, maxwidth, verbose, abbrev;
 293         struct ref_item *list;
 294         struct commit_list *with_commit;
 295         int kinds;
 296 };
 297
 298 static char *resolve_symref(const char *src, const char *prefix)
 299 {
 300         unsigned char sha1[20];
 301         int flag;
 302         const char *dst;
 303
 304         dst = resolve_ref_unsafe(src, 0, sha1, &flag);
 305         if (!(dst && (flag & REF_ISSYMREF)))
 306                 return NULL;
 307         if (prefix)
 308                 skip_prefix(dst, prefix, &dst);
 309         return xstrdup(dst);
 310 }
 311
 312 struct append_ref_cb {
 313         struct ref_list *ref_list;
 314         const char **pattern;
 315         int ret;
 316 };
 317
 318 static int match_patterns(const char **pattern, const char *refname)
 319 {
 320         if (!*pattern)
 321                 return 1; /* no pattern always matches */
 322         while (*pattern) {
 323                 if (!wildmatch(*pattern, refname, 0, NULL))
 324                         return 1;
 325                 pattern++;
 326         }
 327         return 0;
 328 }
 329
 330 static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
 331 {
 332         struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
 333         struct ref_list *ref_list = cb->ref_list;
 334         struct ref_item *newitem;
 335         struct commit *commit;
 336         int kind, i;
 337         const char *prefix, *orig_refname = refname;
 338
 339         static struct {
 340                 int kind;
 341                 const char *prefix;
 342         } ref_kind[] = {
 343                 { REF_LOCAL_BRANCH, "refs/heads/" },
 344                 { REF_REMOTE_BRANCH, "refs/remotes/" },
 345         };
 346
 347         /* Detect kind */
 348         for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
 349                 prefix = ref_kind[i].prefix;
 350                 if (skip_prefix(refname, prefix, &refname)) {
 351                         kind = ref_kind[i].kind;
 352                         break;
 353                 }
 354         }
 355         if (ARRAY_SIZE(ref_kind) <= i)
 356                 return 0;
 357
 358         /* Don't add types the caller doesn't want */
 359         if ((kind & ref_list->kinds) == 0)
 360                 return 0;
 361
 362         if (!match_patterns(cb->pattern, refname))
 363                 return 0;
 364
 365         commit = NULL;
 366         if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
 367                 commit = lookup_commit_reference_gently(sha1, 1);
 368                 if (!commit) {
 369                         cb->ret = error(_("branch '%s' does not point at a commit"), refname);
 370                         return 0;
 371                 }
 372
 373                 /* Filter with with_commit if specified */
 374                 if (!is_descendant_of(commit, ref_list->with_commit))
 375                         return 0;
 376
 377                 if (merge_filter != NO_FILTER)
 378                         add_pending_object(&ref_list->revs,
 379                                            (struct object *)commit, refname);
 380         }
 381
 382         ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc);
 383
 384         /* Record the new item */
 385         newitem = &(ref_list->list[ref_list->index++]);
 386         newitem->name = xstrdup(refname);
 387         newitem->kind = kind;
 388         newitem->commit = commit;
 389         newitem->width = utf8_strwidth(refname);
 390         newitem->dest = resolve_symref(orig_refname, prefix);
 391         newitem->ignore = 0;
 392         /* adjust for "remotes/" */
 393         if (newitem->kind == REF_REMOTE_BRANCH &&
 394             ref_list->kinds != REF_REMOTE_BRANCH)
 395                 newitem->width += 8;
 396         if (newitem->width > ref_list->maxwidth)
 397                 ref_list->maxwidth = newitem->width;
 398
 399         return 0;
 400 }
 401
 402 static void free_ref_list(struct ref_list *ref_list)
 403 {
 404         int i;
 405
 406         for (i = 0; i < ref_list->index; i++) {
 407                 free(ref_list->list[i].name);
 408                 free(ref_list->list[i].dest);
 409         }
 410         free(ref_list->list);
 411 }
 412
 413 static int ref_cmp(const void *r1, const void *r2)
 414 {
 415         struct ref_item *c1 = (struct ref_item *)(r1);
 416         struct ref_item *c2 = (struct ref_item *)(r2);
 417
 418         if (c1->kind != c2->kind)
 419                 return c1->kind - c2->kind;
 420         return strcmp(c1->name, c2->name);
 421 }
 422
 423 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
 424                 int show_upstream_ref)
 425 {
 426         int ours, theirs;
 427         char *ref = NULL;
 428         struct branch *branch = branch_get(branch_name);
 429         struct strbuf fancy = STRBUF_INIT;
 430         int upstream_is_gone = 0;
 431         int added_decoration = 1;
 432
 433         switch (stat_tracking_info(branch, &ours, &theirs)) {
 434         case 0:
 435                 /* no base */
 436                 return;
 437         case -1:
 438                 /* with "gone" base */
 439                 upstream_is_gone = 1;
 440                 break;
 441         default:
 442                 /* with base */
 443                 break;
 444         }
 445
 446         if (show_upstream_ref) {
 447                 ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
 448                 if (want_color(branch_use_color))
 449                         strbuf_addf(&fancy, "%s%s%s",
 450                                         branch_get_color(BRANCH_COLOR_UPSTREAM),
 451                                         ref, branch_get_color(BRANCH_COLOR_RESET));
 452                 else
 453                         strbuf_addstr(&fancy, ref);
 454         }
 455
 456         if (upstream_is_gone) {
 457                 if (show_upstream_ref)
 458                         strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
 459                 else
 460                         added_decoration = 0;
 461         } else if (!ours && !theirs) {
 462                 if (show_upstream_ref)
 463                         strbuf_addf(stat, _("[%s]"), fancy.buf);
 464                 else
 465                         added_decoration = 0;
 466         } else if (!ours) {
 467                 if (show_upstream_ref)
 468                         strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs);
 469                 else
 470                         strbuf_addf(stat, _("[behind %d]"), theirs);
 471
 472         } else if (!theirs) {
 473                 if (show_upstream_ref)
 474                         strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours);
 475                 else
 476                         strbuf_addf(stat, _("[ahead %d]"), ours);
 477         } else {
 478                 if (show_upstream_ref)
 479                         strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
 480                                     fancy.buf, ours, theirs);
 481                 else
 482                         strbuf_addf(stat, _("[ahead %d, behind %d]"),
 483                                     ours, theirs);
 484         }
 485         strbuf_release(&fancy);
 486         if (added_decoration)
 487                 strbuf_addch(stat, ' ');
 488         free(ref);
 489 }
 490
 491 static void add_verbose_info(struct strbuf *out, struct ref_item *item,
 492                              int verbose, int abbrev)
 493 {
 494         struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
 495         const char *sub = _(" **** invalid ref ****");
 496         struct commit *commit = item->commit;
 497
 498         if (!parse_commit(commit)) {
 499                 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
 500                 sub = subject.buf;
 501         }
 502
 503         if (item->kind == REF_LOCAL_BRANCH)
 504                 fill_tracking_info(&stat, item->name, verbose > 1);
 505
 506         strbuf_addf(out, " %s %s%s",
 507                 find_unique_abbrev(item->commit->object.sha1, abbrev),
 508                 stat.buf, sub);
 509         strbuf_release(&stat);
 510         strbuf_release(&subject);
 511 }
 512
 513 static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
 514                            int abbrev, int current, char *prefix)
 515 {
 516         char c;
 517         int color;
 518         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
 519
 520         if (item->ignore)
 521                 return;
 522
 523         switch (item->kind) {
 524         case REF_LOCAL_BRANCH:
 525                 color = BRANCH_COLOR_LOCAL;
 526                 break;
 527         case REF_REMOTE_BRANCH:
 528                 color = BRANCH_COLOR_REMOTE;
 529                 break;
 530         default:
 531                 color = BRANCH_COLOR_PLAIN;
 532                 break;
 533         }
 534
 535         c = ' ';
 536         if (current) {
 537                 c = '*';
 538                 color = BRANCH_COLOR_CURRENT;
 539         }
 540
 541         strbuf_addf(&name, "%s%s", prefix, item->name);
 542         if (verbose) {
 543                 int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf);
 544                 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
 545                             maxwidth + utf8_compensation, name.buf,
 546                             branch_get_color(BRANCH_COLOR_RESET));
 547         } else
 548                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
 549                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
 550
 551         if (item->dest)
 552                 strbuf_addf(&out, " -> %s", item->dest);
 553         else if (verbose)
 554                 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
 555                 add_verbose_info(&out, item, verbose, abbrev);
 556         if (column_active(colopts)) {
 557                 assert(!verbose && "--column and --verbose are incompatible");
 558                 string_list_append(&output, out.buf);
 559         } else {
 560                 printf("%s\n", out.buf);
 561         }
 562         strbuf_release(&name);
 563         strbuf_release(&out);
 564 }
 565
 566 static int calc_maxwidth(struct ref_list *refs)
 567 {
 568         int i, w = 0;
 569         for (i = 0; i < refs->index; i++) {
 570                 if (refs->list[i].ignore)
 571                         continue;
 572                 if (refs->list[i].width > w)
 573                         w = refs->list[i].width;
 574         }
 575         return w;
 576 }
 577
 578 static char *get_head_description(void)
 579 {
 580         struct strbuf desc = STRBUF_INIT;
 581         struct wt_status_state state;
 582         memset(&state, 0, sizeof(state));
 583         wt_status_get_state(&state, 1);
 584         if (state.rebase_in_progress ||
 585             state.rebase_interactive_in_progress)
 586                 strbuf_addf(&desc, _("(no branch, rebasing %s)"),
 587                             state.branch);
 588         else if (state.bisect_in_progress)
 589                 strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
 590                             state.branch);
 591         else if (state.detached_from)
 592                 strbuf_addf(&desc, _("(detached from %s)"),
 593                             state.detached_from);
 594         else
 595                 strbuf_addstr(&desc, _("(no branch)"));
 596         free(state.branch);
 597         free(state.onto);
 598         free(state.detached_from);
 599         return strbuf_detach(&desc, NULL);
 600 }
 601
 602 static void show_detached(struct ref_list *ref_list)
 603 {
 604         struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
 605
 606         if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
 607                 struct ref_item item;
 608                 item.name = get_head_description();
 609                 item.width = utf8_strwidth(item.name);
 610                 item.kind = REF_LOCAL_BRANCH;
 611                 item.dest = NULL;
 612                 item.commit = head_commit;
 613                 item.ignore = 0;
 614                 if (item.width > ref_list->maxwidth)
 615                         ref_list->maxwidth = item.width;
 616                 print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, "");
 617                 free(item.name);
 618         }
 619 }
 620
 621 static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern)
 622 {
 623         int i;
 624         struct append_ref_cb cb;
 625         struct ref_list ref_list;
 626
 627         memset(&ref_list, 0, sizeof(ref_list));
 628         ref_list.kinds = kinds;
 629         ref_list.verbose = verbose;
 630         ref_list.abbrev = abbrev;
 631         ref_list.with_commit = with_commit;
 632         if (merge_filter != NO_FILTER)
 633                 init_revisions(&ref_list.revs, NULL);
 634         cb.ref_list = &ref_list;
 635         cb.pattern = pattern;
 636         cb.ret = 0;
 637         for_each_rawref(append_ref, &cb);
 638         if (merge_filter != NO_FILTER) {
 639                 struct commit *filter;
 640                 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
 641                 if (!filter)
 642                         die(_("object '%s' does not point to a commit"),
 643                             sha1_to_hex(merge_filter_ref));
 644
 645                 filter->object.flags |= UNINTERESTING;
 646                 add_pending_object(&ref_list.revs,
 647                                    (struct object *) filter, "");
 648                 ref_list.revs.limited = 1;
 649
 650                 if (prepare_revision_walk(&ref_list.revs))
 651                         die(_("revision walk setup failed"));
 652
 653                 for (i = 0; i < ref_list.index; i++) {
 654                         struct ref_item *item = &ref_list.list[i];
 655                         struct commit *commit = item->commit;
 656                         int is_merged = !!(commit->object.flags & UNINTERESTING);
 657                         item->ignore = is_merged != (merge_filter == SHOW_MERGED);
 658                 }
 659
 660                 for (i = 0; i < ref_list.index; i++) {
 661                         struct ref_item *item = &ref_list.list[i];
 662                         clear_commit_marks(item->commit, ALL_REV_FLAGS);
 663                 }
 664                 clear_commit_marks(filter, ALL_REV_FLAGS);
 665
 666                 if (verbose)
 667                         ref_list.maxwidth = calc_maxwidth(&ref_list);
 668         }
 669
 670         qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
 671
 672         detached = (detached && (kinds & REF_LOCAL_BRANCH));
 673         if (detached && match_patterns(pattern, "HEAD"))
 674                 show_detached(&ref_list);
 675
 676         for (i = 0; i < ref_list.index; i++) {
 677                 int current = !detached &&
 678                         (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
 679                         !strcmp(ref_list.list[i].name, head);
 680                 char *prefix = (kinds != REF_REMOTE_BRANCH &&
 681                                 ref_list.list[i].kind == REF_REMOTE_BRANCH)
 682                                 ? "remotes/" : "";
 683                 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
 684                                abbrev, current, prefix);
 685         }
 686
 687         free_ref_list(&ref_list);
 688
 689         if (cb.ret)
 690                 error(_("some refs could not be read"));
 691
 692         return cb.ret;
 693 }
 694
 695 static void rename_branch(const char *oldname, const char *newname, int force)
 696 {
 697         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
 698         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
 699         int recovery = 0;
 700         int clobber_head_ok;
 701
 702         if (!oldname)
 703                 die(_("cannot rename the current branch while not on any."));
 704
 705         if (strbuf_check_branch_ref(&oldref, oldname)) {
 706                 /*
 707                  * Bad name --- this could be an attempt to rename a
 708                  * ref that we used to allow to be created by accident.
 709                  */
 710                 if (ref_exists(oldref.buf))
 711                         recovery = 1;
 712                 else
 713                         die(_("Invalid branch name: '%s'"), oldname);
 714         }
 715
 716         /*
 717          * A command like "git branch -M currentbranch currentbranch" cannot
 718          * cause the worktree to become inconsistent with HEAD, so allow it.
 719          */
 720         clobber_head_ok = !strcmp(oldname, newname);
 721
 722         validate_new_branchname(newname, &newref, force, clobber_head_ok);
 723
 724         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 725                  oldref.buf, newref.buf);
 726
 727         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
 728                 die(_("Branch rename failed"));
 729         strbuf_release(&logmsg);
 730
 731         if (recovery)
 732                 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
 733
 734         /* no need to pass logmsg here as HEAD didn't really move */
 735         if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
 736                 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
 737
 738         strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
 739         strbuf_release(&oldref);
 740         strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
 741         strbuf_release(&newref);
 742         if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
 743                 die(_("Branch is renamed, but update of config-file failed"));
 744         strbuf_release(&oldsection);
 745         strbuf_release(&newsection);
 746 }
 747
 748 static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
 749 {
 750         merge_filter = ((opt->long_name[0] == 'n')
 751                         ? SHOW_NOT_MERGED
 752                         : SHOW_MERGED);
 753         if (unset)
 754                 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
 755         if (!arg)
 756                 arg = "HEAD";
 757         if (get_sha1(arg, merge_filter_ref))
 758                 die(_("malformed object name %s"), arg);
 759         return 0;
 760 }
 761
 762 static const char edit_description[] = "BRANCH_DESCRIPTION";
 763
 764 static int edit_branch_description(const char *branch_name)
 765 {
 766         FILE *fp;
 767         int status;
 768         struct strbuf buf = STRBUF_INIT;
 769         struct strbuf name = STRBUF_INIT;
 770
 771         read_branch_desc(&buf, branch_name);
 772         if (!buf.len || buf.buf[buf.len-1] != '\n')
 773                 strbuf_addch(&buf, '\n');
 774         strbuf_commented_addf(&buf,
 775                     "Please edit the description for the branch\n"
 776                     "  %s\n"
 777                     "Lines starting with '%c' will be stripped.\n",
 778                     branch_name, comment_line_char);
 779         fp = fopen(git_path(edit_description), "w");
 780         if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) {
 781                 strbuf_release(&buf);
 782                 return error(_("could not write branch description template: %s"),
 783                              strerror(errno));
 784         }
 785         strbuf_reset(&buf);
 786         if (launch_editor(git_path(edit_description), &buf, NULL)) {
 787                 strbuf_release(&buf);
 788                 return -1;
 789         }
 790         stripspace(&buf, 1);
 791
 792         strbuf_addf(&name, "branch.%s.description", branch_name);
 793         status = git_config_set(name.buf, buf.len ? buf.buf : NULL);
 794         strbuf_release(&name);
 795         strbuf_release(&buf);
 796
 797         return status;
 798 }
 799
 800 int cmd_branch(int argc, const char **argv, const char *prefix)
 801 {
 802         int delete = 0, rename = 0, force_create = 0, list = 0;
 803         int verbose = 0, abbrev = -1, detached = 0;
 804         int reflog = 0, edit_description = 0;
 805         int quiet = 0, unset_upstream = 0;
 806         const char *new_upstream = NULL;
 807         enum branch_track track;
 808         int kinds = REF_LOCAL_BRANCH;
 809         struct commit_list *with_commit = NULL;
 810
 811         struct option options[] = {
 812                 OPT_GROUP(N_("Generic options")),
 813                 OPT__VERBOSE(&verbose,
 814                         N_("show hash and subject, give twice for upstream branch")),
 815                 OPT__QUIET(&quiet, N_("suppress informational messages")),
 816                 OPT_SET_INT('t', "track",  &track, N_("set up tracking mode (see git-pull(1))"),
 817                         BRANCH_TRACK_EXPLICIT),
 818                 OPT_SET_INT( 0, "set-upstream",  &track, N_("change upstream info"),
 819                         BRANCH_TRACK_OVERRIDE),
 820                 OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
 821                 OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
 822                 OPT__COLOR(&branch_use_color, N_("use colored output")),
 823                 OPT_SET_INT('r', "remotes",     &kinds, N_("act on remote-tracking branches"),
 824                         REF_REMOTE_BRANCH),
 825                 {
 826                         OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
 827                         N_("print only branches that contain the commit"),
 828                         PARSE_OPT_LASTARG_DEFAULT,
 829                         parse_opt_with_commit, (intptr_t)"HEAD",
 830                 },
 831                 {
 832                         OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
 833                         N_("print only branches that contain the commit"),
 834                         PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
 835                         parse_opt_with_commit, (intptr_t) "HEAD",
 836                 },
 837                 OPT__ABBREV(&abbrev),
 838
 839                 OPT_GROUP(N_("Specific git-branch actions:")),
 840                 OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"),
 841                         REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
 842                 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
 843                 OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
 844                 OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
 845                 OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
 846                 OPT_BOOL(0, "list", &list, N_("list branch names")),
 847                 OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
 848                 OPT_BOOL(0, "edit-description", &edit_description,
 849                          N_("edit the description for the branch")),
 850                 OPT__FORCE(&force_create, N_("force creation (when already exists)")),
 851                 {
 852                         OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
 853                         N_("commit"), N_("print only not merged branches"),
 854                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
 855                         opt_parse_merge_filter, (intptr_t) "HEAD",
 856                 },
 857                 {
 858                         OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
 859                         N_("commit"), N_("print only merged branches"),
 860                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
 861                         opt_parse_merge_filter, (intptr_t) "HEAD",
 862                 },
 863                 OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
 864                 OPT_END(),
 865         };
 866
 867         if (argc == 2 && !strcmp(argv[1], "-h"))
 868                 usage_with_options(builtin_branch_usage, options);
 869
 870         git_config(git_branch_config, NULL);
 871
 872         track = git_branch_track;
 873
 874         head = resolve_refdup("HEAD", 0, head_sha1, NULL);
 875         if (!head)
 876                 die(_("Failed to resolve HEAD as a valid ref."));
 877         if (!strcmp(head, "HEAD"))
 878                 detached = 1;
 879         else if (!skip_prefix(head, "refs/heads/", &head))
 880                 die(_("HEAD not found below refs/heads!"));
 881         hashcpy(merge_filter_ref, head_sha1);
 882
 883
 884         argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
 885                              0);
 886
 887         if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
 888                 list = 1;
 889
 890         if (with_commit || merge_filter != NO_FILTER)
 891                 list = 1;
 892
 893         if (!!delete + !!rename + !!force_create + !!new_upstream +
 894             list + unset_upstream > 1)
 895                 usage_with_options(builtin_branch_usage, options);
 896
 897         if (abbrev == -1)
 898                 abbrev = DEFAULT_ABBREV;
 899         finalize_colopts(&colopts, -1);
 900         if (verbose) {
 901                 if (explicitly_enable_column(colopts))
 902                         die(_("--column and --verbose are incompatible"));
 903                 colopts = 0;
 904         }
 905
 906         if (delete) {
 907                 if (!argc)
 908                         die(_("branch name required"));
 909                 return delete_branches(argc, argv, delete > 1, kinds, quiet);
 910         } else if (list) {
 911                 int ret = print_ref_list(kinds, detached, verbose, abbrev,
 912                                          with_commit, argv);
 913                 print_columns(&output, colopts, NULL);
 914                 string_list_clear(&output, 0);
 915                 return ret;
 916         }
 917         else if (edit_description) {
 918                 const char *branch_name;
 919                 struct strbuf branch_ref = STRBUF_INIT;
 920
 921                 if (!argc) {
 922                         if (detached)
 923                                 die(_("Cannot give description to detached HEAD"));
 924                         branch_name = head;
 925                 } else if (argc == 1)
 926                         branch_name = argv[0];
 927                 else
 928                         die(_("cannot edit description of more than one branch"));
 929
 930                 strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
 931                 if (!ref_exists(branch_ref.buf)) {
 932                         strbuf_release(&branch_ref);
 933
 934                         if (!argc)
 935                                 return error(_("No commit on branch '%s' yet."),
 936                                              branch_name);
 937                         else
 938                                 return error(_("No branch named '%s'."),
 939                                              branch_name);
 940                 }
 941                 strbuf_release(&branch_ref);
 942
 943                 if (edit_branch_description(branch_name))
 944                         return 1;
 945         } else if (rename) {
 946                 if (!argc)
 947                         die(_("branch name required"));
 948                 else if (argc == 1)
 949                         rename_branch(head, argv[0], rename > 1);
 950                 else if (argc == 2)
 951                         rename_branch(argv[0], argv[1], rename > 1);
 952                 else
 953                         die(_("too many branches for a rename operation"));
 954         } else if (new_upstream) {
 955                 struct branch *branch = branch_get(argv[0]);
 956
 957                 if (argc > 1)
 958                         die(_("too many branches to set new upstream"));
 959
 960                 if (!branch) {
 961                         if (!argc || !strcmp(argv[0], "HEAD"))
 962                                 die(_("could not set upstream of HEAD to %s when "
 963                                       "it does not point to any branch."),
 964                                     new_upstream);
 965                         die(_("no such branch '%s'"), argv[0]);
 966                 }
 967
 968                 if (!ref_exists(branch->refname))
 969                         die(_("branch '%s' does not exist"), branch->name);
 970
 971                 /*
 972                  * create_branch takes care of setting up the tracking
 973                  * info and making sure new_upstream is correct
 974                  */
 975                 create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
 976         } else if (unset_upstream) {
 977                 struct branch *branch = branch_get(argv[0]);
 978                 struct strbuf buf = STRBUF_INIT;
 979
 980                 if (argc > 1)
 981                         die(_("too many branches to unset upstream"));
 982
 983                 if (!branch) {
 984                         if (!argc || !strcmp(argv[0], "HEAD"))
 985                                 die(_("could not unset upstream of HEAD when "
 986                                       "it does not point to any branch."));
 987                         die(_("no such branch '%s'"), argv[0]);
 988                 }
 989
 990                 if (!branch_has_merge_config(branch))
 991                         die(_("Branch '%s' has no upstream information"), branch->name);
 992
 993                 strbuf_addf(&buf, "branch.%s.remote", branch->name);
 994                 git_config_set_multivar(buf.buf, NULL, NULL, 1);
 995                 strbuf_reset(&buf);
 996                 strbuf_addf(&buf, "branch.%s.merge", branch->name);
 997                 git_config_set_multivar(buf.buf, NULL, NULL, 1);
 998                 strbuf_release(&buf);
 999         } else if (argc > 0 && argc <= 2) {
1000                 struct branch *branch = branch_get(argv[0]);
1001                 int branch_existed = 0, remote_tracking = 0;
1002                 struct strbuf buf = STRBUF_INIT;
1003
1004                 if (!strcmp(argv[0], "HEAD"))
1005                         die(_("it does not make sense to create 'HEAD' manually"));
1006
1007                 if (!branch)
1008                         die(_("no such branch '%s'"), argv[0]);
1009
1010                 if (kinds != REF_LOCAL_BRANCH)
1011                         die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
1012
1013                 if (track == BRANCH_TRACK_OVERRIDE)
1014                         fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
1015
1016                 strbuf_addf(&buf, "refs/remotes/%s", branch->name);
1017                 remote_tracking = ref_exists(buf.buf);
1018                 strbuf_release(&buf);
1019
1020                 branch_existed = ref_exists(branch->refname);
1021                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
1022                               force_create, reflog, 0, quiet, track);
1023
1024                 /*
1025                  * We only show the instructions if the user gave us
1026                  * one branch which doesn't exist locally, but is the
1027                  * name of a remote-tracking branch.
1028                  */
1029                 if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
1030                     !branch_existed && remote_tracking) {
1031                         fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
1032                         fprintf(stderr, _("    git branch -d %s\n"), branch->name);
1033                         fprintf(stderr, _("    git branch --set-upstream-to %s\n"), branch->name);
1034                 }
1035
1036         } else
1037                 usage_with_options(builtin_branch_usage, options);
1038
1039         return 0;
1040 }