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