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 #include "ref-filter.h"
  23 #include "worktree.h"
  24
  25 static const char * const builtin_branch_usage[] = {
  26         N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
  27         N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
  28         N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
  29         N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
  30         N_("git branch [<options>] [-r | -a] [--points-at]"),
  31         NULL
  32 };
  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 struct string_list output = STRING_LIST_INIT_DUP;
  56 static unsigned int colopts;
  57
  58 static int parse_branch_color_slot(const char *slot)
  59 {
  60         if (!strcasecmp(slot, "plain"))
  61                 return BRANCH_COLOR_PLAIN;
  62         if (!strcasecmp(slot, "reset"))
  63                 return BRANCH_COLOR_RESET;
  64         if (!strcasecmp(slot, "remote"))
  65                 return BRANCH_COLOR_REMOTE;
  66         if (!strcasecmp(slot, "local"))
  67                 return BRANCH_COLOR_LOCAL;
  68         if (!strcasecmp(slot, "current"))
  69                 return BRANCH_COLOR_CURRENT;
  70         if (!strcasecmp(slot, "upstream"))
  71                 return BRANCH_COLOR_UPSTREAM;
  72         return -1;
  73 }
  74
  75 static int git_branch_config(const char *var, const char *value, void *cb)
  76 {
  77         const char *slot_name;
  78
  79         if (starts_with(var, "column."))
  80                 return git_column_config(var, value, "branch", &colopts);
  81         if (!strcmp(var, "color.branch")) {
  82                 branch_use_color = git_config_colorbool(var, value);
  83                 return 0;
  84         }
  85         if (skip_prefix(var, "color.branch.", &slot_name)) {
  86                 int slot = parse_branch_color_slot(slot_name);
  87                 if (slot < 0)
  88                         return 0;
  89                 if (!value)
  90                         return config_error_nonbool(var);
  91                 return color_parse(value, branch_colors[slot]);
  92         }
  93         return git_color_default_config(var, value, cb);
  94 }
  95
  96 static const char *branch_get_color(enum color_branch ix)
  97 {
  98         if (want_color(branch_use_color))
  99                 return branch_colors[ix];
 100         return "";
 101 }
 102
 103 static int branch_merged(int kind, const char *name,
 104                          struct commit *rev, struct commit *head_rev)
 105 {
 106         /*
 107          * This checks whether the merge bases of branch and HEAD (or
 108          * the other branch this branch builds upon) contains the
 109          * branch, which means that the branch has already been merged
 110          * safely to HEAD (or the other branch).
 111          */
 112         struct commit *reference_rev = NULL;
 113         const char *reference_name = NULL;
 114         void *reference_name_to_free = NULL;
 115         int merged;
 116
 117         if (kind == FILTER_REFS_BRANCHES) {
 118                 struct branch *branch = branch_get(name);
 119                 const char *upstream = branch_get_upstream(branch, NULL);
 120                 unsigned char sha1[20];
 121
 122                 if (upstream &&
 123                     (reference_name = reference_name_to_free =
 124                      resolve_refdup(upstream, RESOLVE_REF_READING,
 125                                     sha1, NULL)) != NULL)
 126                         reference_rev = lookup_commit_reference(sha1);
 127         }
 128         if (!reference_rev)
 129                 reference_rev = head_rev;
 130
 131         merged = in_merge_bases(rev, reference_rev);
 132
 133         /*
 134          * After the safety valve is fully redefined to "check with
 135          * upstream, if any, otherwise with HEAD", we should just
 136          * return the result of the in_merge_bases() above without
 137          * any of the following code, but during the transition period,
 138          * a gentle reminder is in order.
 139          */
 140         if ((head_rev != reference_rev) &&
 141             in_merge_bases(rev, head_rev) != merged) {
 142                 if (merged)
 143                         warning(_("deleting branch '%s' that has been merged to\n"
 144                                 "         '%s', but not yet merged to HEAD."),
 145                                 name, reference_name);
 146                 else
 147                         warning(_("not deleting branch '%s' that is not yet merged to\n"
 148                                 "         '%s', even though it is merged to HEAD."),
 149                                 name, reference_name);
 150         }
 151         free(reference_name_to_free);
 152         return merged;
 153 }
 154
 155 static int check_branch_commit(const char *branchname, const char *refname,
 156                                const unsigned char *sha1, struct commit *head_rev,
 157                                int kinds, int force)
 158 {
 159         struct commit *rev = lookup_commit_reference(sha1);
 160         if (!rev) {
 161                 error(_("Couldn't look up commit object for '%s'"), refname);
 162                 return -1;
 163         }
 164         if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
 165                 error(_("The branch '%s' is not fully merged.\n"
 166                       "If you are sure you want to delete it, "
 167                       "run 'git branch -D %s'."), branchname, branchname);
 168                 return -1;
 169         }
 170         return 0;
 171 }
 172
 173 static void delete_branch_config(const char *branchname)
 174 {
 175         struct strbuf buf = STRBUF_INIT;
 176         strbuf_addf(&buf, "branch.%s", branchname);
 177         if (git_config_rename_section(buf.buf, NULL) < 0)
 178                 warning(_("Update of config-file failed"));
 179         strbuf_release(&buf);
 180 }
 181
 182 static int delete_branches(int argc, const char **argv, int force, int kinds,
 183                            int quiet)
 184 {
 185         struct commit *head_rev = NULL;
 186         unsigned char sha1[20];
 187         char *name = NULL;
 188         const char *fmt;
 189         int i;
 190         int ret = 0;
 191         int remote_branch = 0;
 192         struct strbuf bname = STRBUF_INIT;
 193
 194         switch (kinds) {
 195         case FILTER_REFS_REMOTES:
 196                 fmt = "refs/remotes/%s";
 197                 /* For subsequent UI messages */
 198                 remote_branch = 1;
 199
 200                 force = 1;
 201                 break;
 202         case FILTER_REFS_BRANCHES:
 203                 fmt = "refs/heads/%s";
 204                 break;
 205         default:
 206                 die(_("cannot use -a with -d"));
 207         }
 208
 209         if (!force) {
 210                 head_rev = lookup_commit_reference(head_sha1);
 211                 if (!head_rev)
 212                         die(_("Couldn't look up commit object for HEAD"));
 213         }
 214         for (i = 0; i < argc; i++, strbuf_release(&bname)) {
 215                 const char *target;
 216                 int flags = 0;
 217
 218                 strbuf_branchname(&bname, argv[i]);
 219                 free(name);
 220                 name = mkpathdup(fmt, bname.buf);
 221
 222                 if (kinds == FILTER_REFS_BRANCHES) {
 223                         char *worktree = find_shared_symref("HEAD", name);
 224                         if (worktree) {
 225                                 error(_("Cannot delete branch '%s' "
 226                                         "checked out at '%s'"),
 227                                       bname.buf, worktree);
 228                                 free(worktree);
 229                                 ret = 1;
 230                                 continue;
 231                         }
 232                 }
 233
 234                 target = resolve_ref_unsafe(name,
 235                                             RESOLVE_REF_READING
 236                                             | RESOLVE_REF_NO_RECURSE
 237                                             | RESOLVE_REF_ALLOW_BAD_NAME,
 238                                             sha1, &flags);
 239                 if (!target) {
 240                         error(remote_branch
 241                               ? _("remote-tracking branch '%s' not found.")
 242                               : _("branch '%s' not found."), bname.buf);
 243                         ret = 1;
 244                         continue;
 245                 }
 246
 247                 if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
 248                     check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
 249                                         force)) {
 250                         ret = 1;
 251                         continue;
 252                 }
 253
 254                 if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1,
 255                                REF_NODEREF)) {
 256                         error(remote_branch
 257                               ? _("Error deleting remote-tracking branch '%s'")
 258                               : _("Error deleting branch '%s'"),
 259                               bname.buf);
 260                         ret = 1;
 261                         continue;
 262                 }
 263                 if (!quiet) {
 264                         printf(remote_branch
 265                                ? _("Deleted remote-tracking branch %s (was %s).\n")
 266                                : _("Deleted branch %s (was %s).\n"),
 267                                bname.buf,
 268                                (flags & REF_ISBROKEN) ? "broken"
 269                                : (flags & REF_ISSYMREF) ? target
 270                                : find_unique_abbrev(sha1, DEFAULT_ABBREV));
 271                 }
 272                 delete_branch_config(bname.buf);
 273         }
 274
 275         free(name);
 276
 277         return(ret);
 278 }
 279
 280 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
 281                 int show_upstream_ref)
 282 {
 283         int ours, theirs;
 284         char *ref = NULL;
 285         struct branch *branch = branch_get(branch_name);
 286         const char *upstream;
 287         struct strbuf fancy = STRBUF_INIT;
 288         int upstream_is_gone = 0;
 289         int added_decoration = 1;
 290
 291         if (stat_tracking_info(branch, &ours, &theirs, &upstream) < 0) {
 292                 if (!upstream)
 293                         return;
 294                 upstream_is_gone = 1;
 295         }
 296
 297         if (show_upstream_ref) {
 298                 ref = shorten_unambiguous_ref(upstream, 0);
 299                 if (want_color(branch_use_color))
 300                         strbuf_addf(&fancy, "%s%s%s",
 301                                         branch_get_color(BRANCH_COLOR_UPSTREAM),
 302                                         ref, branch_get_color(BRANCH_COLOR_RESET));
 303                 else
 304                         strbuf_addstr(&fancy, ref);
 305         }
 306
 307         if (upstream_is_gone) {
 308                 if (show_upstream_ref)
 309                         strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
 310                 else
 311                         added_decoration = 0;
 312         } else if (!ours && !theirs) {
 313                 if (show_upstream_ref)
 314                         strbuf_addf(stat, _("[%s]"), fancy.buf);
 315                 else
 316                         added_decoration = 0;
 317         } else if (!ours) {
 318                 if (show_upstream_ref)
 319                         strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs);
 320                 else
 321                         strbuf_addf(stat, _("[behind %d]"), theirs);
 322
 323         } else if (!theirs) {
 324                 if (show_upstream_ref)
 325                         strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours);
 326                 else
 327                         strbuf_addf(stat, _("[ahead %d]"), ours);
 328         } else {
 329                 if (show_upstream_ref)
 330                         strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
 331                                     fancy.buf, ours, theirs);
 332                 else
 333                         strbuf_addf(stat, _("[ahead %d, behind %d]"),
 334                                     ours, theirs);
 335         }
 336         strbuf_release(&fancy);
 337         if (added_decoration)
 338                 strbuf_addch(stat, ' ');
 339         free(ref);
 340 }
 341
 342 static void add_verbose_info(struct strbuf *out, struct ref_array_item *item,
 343                              struct ref_filter *filter, const char *refname)
 344 {
 345         struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
 346         const char *sub = _(" **** invalid ref ****");
 347         struct commit *commit = item->commit;
 348
 349         if (!parse_commit(commit)) {
 350                 pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject);
 351                 sub = subject.buf;
 352         }
 353
 354         if (item->kind == FILTER_REFS_BRANCHES)
 355                 fill_tracking_info(&stat, refname, filter->verbose > 1);
 356
 357         strbuf_addf(out, " %s %s%s",
 358                 find_unique_abbrev(item->commit->object.oid.hash, filter->abbrev),
 359                 stat.buf, sub);
 360         strbuf_release(&stat);
 361         strbuf_release(&subject);
 362 }
 363
 364 static char *get_head_description(void)
 365 {
 366         struct strbuf desc = STRBUF_INIT;
 367         struct wt_status_state state;
 368         memset(&state, 0, sizeof(state));
 369         wt_status_get_state(&state, 1);
 370         if (state.rebase_in_progress ||
 371             state.rebase_interactive_in_progress)
 372                 strbuf_addf(&desc, _("(no branch, rebasing %s)"),
 373                             state.branch);
 374         else if (state.bisect_in_progress)
 375                 strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
 376                             state.branch);
 377         else if (state.detached_from) {
 378                 /* TRANSLATORS: make sure these match _("HEAD detached at ")
 379                    and _("HEAD detached from ") in wt-status.c */
 380                 if (state.detached_at)
 381                         strbuf_addf(&desc, _("(HEAD detached at %s)"),
 382                                 state.detached_from);
 383                 else
 384                         strbuf_addf(&desc, _("(HEAD detached from %s)"),
 385                                 state.detached_from);
 386         }
 387         else
 388                 strbuf_addstr(&desc, _("(no branch)"));
 389         free(state.branch);
 390         free(state.onto);
 391         free(state.detached_from);
 392         return strbuf_detach(&desc, NULL);
 393 }
 394
 395 static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth,
 396                                       struct ref_filter *filter, const char *remote_prefix)
 397 {
 398         char c;
 399         int current = 0;
 400         int color;
 401         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
 402         const char *prefix = "";
 403         const char *desc = item->refname;
 404         char *to_free = NULL;
 405
 406         switch (item->kind) {
 407         case FILTER_REFS_BRANCHES:
 408                 skip_prefix(desc, "refs/heads/", &desc);
 409                 if (!filter->detached && !strcmp(desc, head))
 410                         current = 1;
 411                 else
 412                         color = BRANCH_COLOR_LOCAL;
 413                 break;
 414         case FILTER_REFS_REMOTES:
 415                 skip_prefix(desc, "refs/remotes/", &desc);
 416                 color = BRANCH_COLOR_REMOTE;
 417                 prefix = remote_prefix;
 418                 break;
 419         case FILTER_REFS_DETACHED_HEAD:
 420                 desc = to_free = get_head_description();
 421                 current = 1;
 422                 break;
 423         default:
 424                 color = BRANCH_COLOR_PLAIN;
 425                 break;
 426         }
 427
 428         c = ' ';
 429         if (current) {
 430                 c = '*';
 431                 color = BRANCH_COLOR_CURRENT;
 432         }
 433
 434         strbuf_addf(&name, "%s%s", prefix, desc);
 435         if (filter->verbose) {
 436                 int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf);
 437                 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
 438                             maxwidth + utf8_compensation, name.buf,
 439                             branch_get_color(BRANCH_COLOR_RESET));
 440         } else
 441                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
 442                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
 443
 444         if (item->symref) {
 445                 skip_prefix(item->symref, "refs/remotes/", &desc);
 446                 strbuf_addf(&out, " -> %s", desc);
 447         }
 448         else if (filter->verbose)
 449                 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
 450                 add_verbose_info(&out, item, filter, desc);
 451         if (column_active(colopts)) {
 452                 assert(!filter->verbose && "--column and --verbose are incompatible");
 453                 string_list_append(&output, out.buf);
 454         } else {
 455                 printf("%s\n", out.buf);
 456         }
 457         strbuf_release(&name);
 458         strbuf_release(&out);
 459         free(to_free);
 460 }
 461
 462 static int calc_maxwidth(struct ref_array *refs, int remote_bonus)
 463 {
 464         int i, max = 0;
 465         for (i = 0; i < refs->nr; i++) {
 466                 struct ref_array_item *it = refs->items[i];
 467                 const char *desc = it->refname;
 468                 int w;
 469
 470                 skip_prefix(it->refname, "refs/heads/", &desc);
 471                 skip_prefix(it->refname, "refs/remotes/", &desc);
 472                 w = utf8_strwidth(desc);
 473
 474                 if (it->kind == FILTER_REFS_REMOTES)
 475                         w += remote_bonus;
 476                 if (w > max)
 477                         max = w;
 478         }
 479         return max;
 480 }
 481
 482 static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting)
 483 {
 484         int i;
 485         struct ref_array array;
 486         int maxwidth = 0;
 487         const char *remote_prefix = "";
 488
 489         /*
 490          * If we are listing more than just remote branches,
 491          * then remote branches will have a "remotes/" prefix.
 492          * We need to account for this in the width.
 493          */
 494         if (filter->kind != FILTER_REFS_REMOTES)
 495                 remote_prefix = "remotes/";
 496
 497         memset(&array, 0, sizeof(array));
 498
 499         verify_ref_format("%(refname)%(symref)");
 500         filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN);
 501
 502         if (filter->verbose)
 503                 maxwidth = calc_maxwidth(&array, strlen(remote_prefix));
 504
 505         /*
 506          * If no sorting parameter is given then we default to sorting
 507          * by 'refname'. This would give us an alphabetically sorted
 508          * array with the 'HEAD' ref at the beginning followed by
 509          * local branches 'refs/heads/...' and finally remote-tacking
 510          * branches 'refs/remotes/...'.
 511          */
 512         if (!sorting)
 513                 sorting = ref_default_sorting();
 514         ref_array_sort(sorting, &array);
 515
 516         for (i = 0; i < array.nr; i++)
 517                 format_and_print_ref_item(array.items[i], maxwidth, filter, remote_prefix);
 518
 519         ref_array_clear(&array);
 520 }
 521
 522 static void rename_branch(const char *oldname, const char *newname, int force)
 523 {
 524         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
 525         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
 526         int recovery = 0;
 527         int clobber_head_ok;
 528
 529         if (!oldname)
 530                 die(_("cannot rename the current branch while not on any."));
 531
 532         if (strbuf_check_branch_ref(&oldref, oldname)) {
 533                 /*
 534                  * Bad name --- this could be an attempt to rename a
 535                  * ref that we used to allow to be created by accident.
 536                  */
 537                 if (ref_exists(oldref.buf))
 538                         recovery = 1;
 539                 else
 540                         die(_("Invalid branch name: '%s'"), oldname);
 541         }
 542
 543         /*
 544          * A command like "git branch -M currentbranch currentbranch" cannot
 545          * cause the worktree to become inconsistent with HEAD, so allow it.
 546          */
 547         clobber_head_ok = !strcmp(oldname, newname);
 548
 549         validate_new_branchname(newname, &newref, force, clobber_head_ok);
 550
 551         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 552                  oldref.buf, newref.buf);
 553
 554         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
 555                 die(_("Branch rename failed"));
 556         strbuf_release(&logmsg);
 557
 558         if (recovery)
 559                 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
 560
 561         if (replace_each_worktree_head_symref(oldref.buf, newref.buf))
 562                 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
 563
 564         strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
 565         strbuf_release(&oldref);
 566         strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
 567         strbuf_release(&newref);
 568         if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
 569                 die(_("Branch is renamed, but update of config-file failed"));
 570         strbuf_release(&oldsection);
 571         strbuf_release(&newsection);
 572 }
 573
 574 static const char edit_description[] = "BRANCH_DESCRIPTION";
 575
 576 static int edit_branch_description(const char *branch_name)
 577 {
 578         struct strbuf buf = STRBUF_INIT;
 579         struct strbuf name = STRBUF_INIT;
 580
 581         read_branch_desc(&buf, branch_name);
 582         if (!buf.len || buf.buf[buf.len-1] != '\n')
 583                 strbuf_addch(&buf, '\n');
 584         strbuf_commented_addf(&buf,
 585                     "Please edit the description for the branch\n"
 586                     "  %s\n"
 587                     "Lines starting with '%c' will be stripped.\n",
 588                     branch_name, comment_line_char);
 589         if (write_file_gently(git_path(edit_description), "%s", buf.buf)) {
 590                 strbuf_release(&buf);
 591                 return error(_("could not write branch description template: %s"),
 592                              strerror(errno));
 593         }
 594         strbuf_reset(&buf);
 595         if (launch_editor(git_path(edit_description), &buf, NULL)) {
 596                 strbuf_release(&buf);
 597                 return -1;
 598         }
 599         strbuf_stripspace(&buf, 1);
 600
 601         strbuf_addf(&name, "branch.%s.description", branch_name);
 602         git_config_set(name.buf, buf.len ? buf.buf : NULL);
 603         strbuf_release(&name);
 604         strbuf_release(&buf);
 605
 606         return 0;
 607 }
 608
 609 int cmd_branch(int argc, const char **argv, const char *prefix)
 610 {
 611         int delete = 0, rename = 0, force = 0, list = 0;
 612         int reflog = 0, edit_description = 0;
 613         int quiet = 0, unset_upstream = 0;
 614         const char *new_upstream = NULL;
 615         enum branch_track track;
 616         struct ref_filter filter;
 617         static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
 618
 619         struct option options[] = {
 620                 OPT_GROUP(N_("Generic options")),
 621                 OPT__VERBOSE(&filter.verbose,
 622                         N_("show hash and subject, give twice for upstream branch")),
 623                 OPT__QUIET(&quiet, N_("suppress informational messages")),
 624                 OPT_SET_INT('t', "track",  &track, N_("set up tracking mode (see git-pull(1))"),
 625                         BRANCH_TRACK_EXPLICIT),
 626                 OPT_SET_INT( 0, "set-upstream",  &track, N_("change upstream info"),
 627                         BRANCH_TRACK_OVERRIDE),
 628                 OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
 629                 OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
 630                 OPT__COLOR(&branch_use_color, N_("use colored output")),
 631                 OPT_SET_INT('r', "remotes",     &filter.kind, N_("act on remote-tracking branches"),
 632                         FILTER_REFS_REMOTES),
 633                 OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")),
 634                 OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")),
 635                 OPT__ABBREV(&filter.abbrev),
 636
 637                 OPT_GROUP(N_("Specific git-branch actions:")),
 638                 OPT_SET_INT('a', "all", &filter.kind, N_("list both remote-tracking and local branches"),
 639                         FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES),
 640                 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
 641                 OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
 642                 OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
 643                 OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
 644                 OPT_BOOL(0, "list", &list, N_("list branch names")),
 645                 OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
 646                 OPT_BOOL(0, "edit-description", &edit_description,
 647                          N_("edit the description for the branch")),
 648                 OPT__FORCE(&force, N_("force creation, move/rename, deletion")),
 649                 OPT_MERGED(&filter, N_("print only branches that are merged")),
 650                 OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
 651                 OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
 652                 OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
 653                              N_("field name to sort on"), &parse_opt_ref_sorting),
 654                 {
 655                         OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
 656                         N_("print only branches of the object"), 0, parse_opt_object_name
 657                 },
 658                 OPT_END(),
 659         };
 660
 661         memset(&filter, 0, sizeof(filter));
 662         filter.kind = FILTER_REFS_BRANCHES;
 663         filter.abbrev = -1;
 664
 665         if (argc == 2 && !strcmp(argv[1], "-h"))
 666                 usage_with_options(builtin_branch_usage, options);
 667
 668         git_config(git_branch_config, NULL);
 669
 670         track = git_branch_track;
 671
 672         head = resolve_refdup("HEAD", 0, head_sha1, NULL);
 673         if (!head)
 674                 die(_("Failed to resolve HEAD as a valid ref."));
 675         if (!strcmp(head, "HEAD"))
 676                 filter.detached = 1;
 677         else if (!skip_prefix(head, "refs/heads/", &head))
 678                 die(_("HEAD not found below refs/heads!"));
 679
 680         argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
 681                              0);
 682
 683         if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
 684                 list = 1;
 685
 686         if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr)
 687                 list = 1;
 688
 689         if (!!delete + !!rename + !!new_upstream +
 690             list + unset_upstream > 1)
 691                 usage_with_options(builtin_branch_usage, options);
 692
 693         if (filter.abbrev == -1)
 694                 filter.abbrev = DEFAULT_ABBREV;
 695         finalize_colopts(&colopts, -1);
 696         if (filter.verbose) {
 697                 if (explicitly_enable_column(colopts))
 698                         die(_("--column and --verbose are incompatible"));
 699                 colopts = 0;
 700         }
 701
 702         if (force) {
 703                 delete *= 2;
 704                 rename *= 2;
 705         }
 706
 707         if (delete) {
 708                 if (!argc)
 709                         die(_("branch name required"));
 710                 return delete_branches(argc, argv, delete > 1, filter.kind, quiet);
 711         } else if (list) {
 712                 /*  git branch --local also shows HEAD when it is detached */
 713                 if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
 714                         filter.kind |= FILTER_REFS_DETACHED_HEAD;
 715                 filter.name_patterns = argv;
 716                 print_ref_list(&filter, sorting);
 717                 print_columns(&output, colopts, NULL);
 718                 string_list_clear(&output, 0);
 719                 return 0;
 720         }
 721         else if (edit_description) {
 722                 const char *branch_name;
 723                 struct strbuf branch_ref = STRBUF_INIT;
 724
 725                 if (!argc) {
 726                         if (filter.detached)
 727                                 die(_("Cannot give description to detached HEAD"));
 728                         branch_name = head;
 729                 } else if (argc == 1)
 730                         branch_name = argv[0];
 731                 else
 732                         die(_("cannot edit description of more than one branch"));
 733
 734                 strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
 735                 if (!ref_exists(branch_ref.buf)) {
 736                         strbuf_release(&branch_ref);
 737
 738                         if (!argc)
 739                                 return error(_("No commit on branch '%s' yet."),
 740                                              branch_name);
 741                         else
 742                                 return error(_("No branch named '%s'."),
 743                                              branch_name);
 744                 }
 745                 strbuf_release(&branch_ref);
 746
 747                 if (edit_branch_description(branch_name))
 748                         return 1;
 749         } else if (rename) {
 750                 if (!argc)
 751                         die(_("branch name required"));
 752                 else if (argc == 1)
 753                         rename_branch(head, argv[0], rename > 1);
 754                 else if (argc == 2)
 755                         rename_branch(argv[0], argv[1], rename > 1);
 756                 else
 757                         die(_("too many branches for a rename operation"));
 758         } else if (new_upstream) {
 759                 struct branch *branch = branch_get(argv[0]);
 760
 761                 if (argc > 1)
 762                         die(_("too many branches to set new upstream"));
 763
 764                 if (!branch) {
 765                         if (!argc || !strcmp(argv[0], "HEAD"))
 766                                 die(_("could not set upstream of HEAD to %s when "
 767                                       "it does not point to any branch."),
 768                                     new_upstream);
 769                         die(_("no such branch '%s'"), argv[0]);
 770                 }
 771
 772                 if (!ref_exists(branch->refname))
 773                         die(_("branch '%s' does not exist"), branch->name);
 774
 775                 /*
 776                  * create_branch takes care of setting up the tracking
 777                  * info and making sure new_upstream is correct
 778                  */
 779                 create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
 780         } else if (unset_upstream) {
 781                 struct branch *branch = branch_get(argv[0]);
 782                 struct strbuf buf = STRBUF_INIT;
 783
 784                 if (argc > 1)
 785                         die(_("too many branches to unset upstream"));
 786
 787                 if (!branch) {
 788                         if (!argc || !strcmp(argv[0], "HEAD"))
 789                                 die(_("could not unset upstream of HEAD when "
 790                                       "it does not point to any branch."));
 791                         die(_("no such branch '%s'"), argv[0]);
 792                 }
 793
 794                 if (!branch_has_merge_config(branch))
 795                         die(_("Branch '%s' has no upstream information"), branch->name);
 796
 797                 strbuf_addf(&buf, "branch.%s.remote", branch->name);
 798                 git_config_set_multivar(buf.buf, NULL, NULL, 1);
 799                 strbuf_reset(&buf);
 800                 strbuf_addf(&buf, "branch.%s.merge", branch->name);
 801                 git_config_set_multivar(buf.buf, NULL, NULL, 1);
 802                 strbuf_release(&buf);
 803         } else if (argc > 0 && argc <= 2) {
 804                 struct branch *branch = branch_get(argv[0]);
 805                 int branch_existed = 0, remote_tracking = 0;
 806                 struct strbuf buf = STRBUF_INIT;
 807
 808                 if (!strcmp(argv[0], "HEAD"))
 809                         die(_("it does not make sense to create 'HEAD' manually"));
 810
 811                 if (!branch)
 812                         die(_("no such branch '%s'"), argv[0]);
 813
 814                 if (filter.kind != FILTER_REFS_BRANCHES)
 815                         die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
 816
 817                 if (track == BRANCH_TRACK_OVERRIDE)
 818                         fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
 819
 820                 strbuf_addf(&buf, "refs/remotes/%s", branch->name);
 821                 remote_tracking = ref_exists(buf.buf);
 822                 strbuf_release(&buf);
 823
 824                 branch_existed = ref_exists(branch->refname);
 825                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
 826                               force, reflog, 0, quiet, track);
 827
 828                 /*
 829                  * We only show the instructions if the user gave us
 830                  * one branch which doesn't exist locally, but is the
 831                  * name of a remote-tracking branch.
 832                  */
 833                 if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
 834                     !branch_existed && remote_tracking) {
 835                         fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
 836                         fprintf(stderr, _("    git branch -d %s\n"), branch->name);
 837                         fprintf(stderr, _("    git branch --set-upstream-to %s\n"), branch->name);
 838                 }
 839
 840         } else
 841                 usage_with_options(builtin_branch_usage, options);
 842
 843         return 0;
 844 }