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