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