builtin / checkout.con commit Documentation/git-worktree: fix duplicated 'from' (65f9b75)
   1#include "builtin.h"
   2#include "lockfile.h"
   3#include "parse-options.h"
   4#include "refs.h"
   5#include "commit.h"
   6#include "tree.h"
   7#include "tree-walk.h"
   8#include "cache-tree.h"
   9#include "unpack-trees.h"
  10#include "dir.h"
  11#include "run-command.h"
  12#include "merge-recursive.h"
  13#include "branch.h"
  14#include "diff.h"
  15#include "revision.h"
  16#include "remote.h"
  17#include "blob.h"
  18#include "xdiff-interface.h"
  19#include "ll-merge.h"
  20#include "resolve-undo.h"
  21#include "submodule.h"
  22
  23static const char * const checkout_usage[] = {
  24        N_("git checkout [options] <branch>"),
  25        N_("git checkout [options] [<branch>] -- <file>..."),
  26        NULL,
  27};
  28
  29struct checkout_opts {
  30        int patch_mode;
  31        int quiet;
  32        int merge;
  33        int force;
  34        int force_detach;
  35        int writeout_stage;
  36        int overwrite_ignore;
  37        int ignore_skipworktree;
  38        int ignore_other_worktrees;
  39
  40        const char *new_branch;
  41        const char *new_branch_force;
  42        const char *new_orphan_branch;
  43        int new_branch_log;
  44        enum branch_track track;
  45        struct diff_options diff_options;
  46
  47        int branch_exists;
  48        const char *prefix;
  49        struct pathspec pathspec;
  50        struct tree *source_tree;
  51};
  52
  53static int post_checkout_hook(struct commit *old, struct commit *new,
  54                              int changed)
  55{
  56        return run_hook_le(NULL, "post-checkout",
  57                           sha1_to_hex(old ? old->object.sha1 : null_sha1),
  58                           sha1_to_hex(new ? new->object.sha1 : null_sha1),
  59                           changed ? "1" : "0", NULL);
  60        /* "new" can be NULL when checking out from the index before
  61           a commit exists. */
  62
  63}
  64
  65static int update_some(const unsigned char *sha1, const char *base, int baselen,
  66                const char *pathname, unsigned mode, int stage, void *context)
  67{
  68        int len;
  69        struct cache_entry *ce;
  70
  71        if (S_ISDIR(mode))
  72                return READ_TREE_RECURSIVE;
  73
  74        len = baselen + strlen(pathname);
  75        ce = xcalloc(1, cache_entry_size(len));
  76        hashcpy(ce->sha1, sha1);
  77        memcpy(ce->name, base, baselen);
  78        memcpy(ce->name + baselen, pathname, len - baselen);
  79        ce->ce_flags = create_ce_flags(0) | CE_UPDATE;
  80        ce->ce_namelen = len;
  81        ce->ce_mode = create_ce_mode(mode);
  82        add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
  83        return 0;
  84}
  85
  86static int read_tree_some(struct tree *tree, const struct pathspec *pathspec)
  87{
  88        read_tree_recursive(tree, "", 0, 0, pathspec, update_some, NULL);
  89
  90        /* update the index with the given tree's info
  91         * for all args, expanding wildcards, and exit
  92         * with any non-zero return code.
  93         */
  94        return 0;
  95}
  96
  97static int skip_same_name(const struct cache_entry *ce, int pos)
  98{
  99        while (++pos < active_nr &&
 100               !strcmp(active_cache[pos]->name, ce->name))
 101                ; /* skip */
 102        return pos;
 103}
 104
 105static int check_stage(int stage, const struct cache_entry *ce, int pos)
 106{
 107        while (pos < active_nr &&
 108               !strcmp(active_cache[pos]->name, ce->name)) {
 109                if (ce_stage(active_cache[pos]) == stage)
 110                        return 0;
 111                pos++;
 112        }
 113        if (stage == 2)
 114                return error(_("path '%s' does not have our version"), ce->name);
 115        else
 116                return error(_("path '%s' does not have their version"), ce->name);
 117}
 118
 119static int check_stages(unsigned stages, const struct cache_entry *ce, int pos)
 120{
 121        unsigned seen = 0;
 122        const char *name = ce->name;
 123
 124        while (pos < active_nr) {
 125                ce = active_cache[pos];
 126                if (strcmp(name, ce->name))
 127                        break;
 128                seen |= (1 << ce_stage(ce));
 129                pos++;
 130        }
 131        if ((stages & seen) != stages)
 132                return error(_("path '%s' does not have all necessary versions"),
 133                             name);
 134        return 0;
 135}
 136
 137static int checkout_stage(int stage, struct cache_entry *ce, int pos,
 138                          struct checkout *state)
 139{
 140        while (pos < active_nr &&
 141               !strcmp(active_cache[pos]->name, ce->name)) {
 142                if (ce_stage(active_cache[pos]) == stage)
 143                        return checkout_entry(active_cache[pos], state, NULL);
 144                pos++;
 145        }
 146        if (stage == 2)
 147                return error(_("path '%s' does not have our version"), ce->name);
 148        else
 149                return error(_("path '%s' does not have their version"), ce->name);
 150}
 151
 152static int checkout_merged(int pos, struct checkout *state)
 153{
 154        struct cache_entry *ce = active_cache[pos];
 155        const char *path = ce->name;
 156        mmfile_t ancestor, ours, theirs;
 157        int status;
 158        unsigned char sha1[20];
 159        mmbuffer_t result_buf;
 160        unsigned char threeway[3][20];
 161        unsigned mode = 0;
 162
 163        memset(threeway, 0, sizeof(threeway));
 164        while (pos < active_nr) {
 165                int stage;
 166                stage = ce_stage(ce);
 167                if (!stage || strcmp(path, ce->name))
 168                        break;
 169                hashcpy(threeway[stage - 1], ce->sha1);
 170                if (stage == 2)
 171                        mode = create_ce_mode(ce->ce_mode);
 172                pos++;
 173                ce = active_cache[pos];
 174        }
 175        if (is_null_sha1(threeway[1]) || is_null_sha1(threeway[2]))
 176                return error(_("path '%s' does not have necessary versions"), path);
 177
 178        read_mmblob(&ancestor, threeway[0]);
 179        read_mmblob(&ours, threeway[1]);
 180        read_mmblob(&theirs, threeway[2]);
 181
 182        /*
 183         * NEEDSWORK: re-create conflicts from merges with
 184         * merge.renormalize set, too
 185         */
 186        status = ll_merge(&result_buf, path, &ancestor, "base",
 187                          &ours, "ours", &theirs, "theirs", NULL);
 188        free(ancestor.ptr);
 189        free(ours.ptr);
 190        free(theirs.ptr);
 191        if (status < 0 || !result_buf.ptr) {
 192                free(result_buf.ptr);
 193                return error(_("path '%s': cannot merge"), path);
 194        }
 195
 196        /*
 197         * NEEDSWORK:
 198         * There is absolutely no reason to write this as a blob object
 199         * and create a phony cache entry just to leak.  This hack is
 200         * primarily to get to the write_entry() machinery that massages
 201         * the contents to work-tree format and writes out which only
 202         * allows it for a cache entry.  The code in write_entry() needs
 203         * to be refactored to allow us to feed a <buffer, size, mode>
 204         * instead of a cache entry.  Such a refactoring would help
 205         * merge_recursive as well (it also writes the merge result to the
 206         * object database even when it may contain conflicts).
 207         */
 208        if (write_sha1_file(result_buf.ptr, result_buf.size,
 209                            blob_type, sha1))
 210                die(_("Unable to add merge result for '%s'"), path);
 211        ce = make_cache_entry(mode, sha1, path, 2, 0);
 212        if (!ce)
 213                die(_("make_cache_entry failed for path '%s'"), path);
 214        status = checkout_entry(ce, state, NULL);
 215        return status;
 216}
 217
 218static int checkout_paths(const struct checkout_opts *opts,
 219                          const char *revision)
 220{
 221        int pos;
 222        struct checkout state;
 223        static char *ps_matched;
 224        unsigned char rev[20];
 225        int flag;
 226        struct commit *head;
 227        int errs = 0;
 228        struct lock_file *lock_file;
 229
 230        if (opts->track != BRANCH_TRACK_UNSPECIFIED)
 231                die(_("'%s' cannot be used with updating paths"), "--track");
 232
 233        if (opts->new_branch_log)
 234                die(_("'%s' cannot be used with updating paths"), "-l");
 235
 236        if (opts->force && opts->patch_mode)
 237                die(_("'%s' cannot be used with updating paths"), "-f");
 238
 239        if (opts->force_detach)
 240                die(_("'%s' cannot be used with updating paths"), "--detach");
 241
 242        if (opts->merge && opts->patch_mode)
 243                die(_("'%s' cannot be used with %s"), "--merge", "--patch");
 244
 245        if (opts->force && opts->merge)
 246                die(_("'%s' cannot be used with %s"), "-f", "-m");
 247
 248        if (opts->new_branch)
 249                die(_("Cannot update paths and switch to branch '%s' at the same time."),
 250                    opts->new_branch);
 251
 252        if (opts->patch_mode)
 253                return run_add_interactive(revision, "--patch=checkout",
 254                                           &opts->pathspec);
 255
 256        lock_file = xcalloc(1, sizeof(struct lock_file));
 257
 258        hold_locked_index(lock_file, 1);
 259        if (read_cache_preload(&opts->pathspec) < 0)
 260                return error(_("corrupt index file"));
 261
 262        if (opts->source_tree)
 263                read_tree_some(opts->source_tree, &opts->pathspec);
 264
 265        ps_matched = xcalloc(1, opts->pathspec.nr);
 266
 267        /*
 268         * Make sure all pathspecs participated in locating the paths
 269         * to be checked out.
 270         */
 271        for (pos = 0; pos < active_nr; pos++) {
 272                struct cache_entry *ce = active_cache[pos];
 273                ce->ce_flags &= ~CE_MATCHED;
 274                if (!opts->ignore_skipworktree && ce_skip_worktree(ce))
 275                        continue;
 276                if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
 277                        /*
 278                         * "git checkout tree-ish -- path", but this entry
 279                         * is in the original index; it will not be checked
 280                         * out to the working tree and it does not matter
 281                         * if pathspec matched this entry.  We will not do
 282                         * anything to this entry at all.
 283                         */
 284                        continue;
 285                /*
 286                 * Either this entry came from the tree-ish we are
 287                 * checking the paths out of, or we are checking out
 288                 * of the index.
 289                 *
 290                 * If it comes from the tree-ish, we already know it
 291                 * matches the pathspec and could just stamp
 292                 * CE_MATCHED to it from update_some(). But we still
 293                 * need ps_matched and read_tree_recursive (and
 294                 * eventually tree_entry_interesting) cannot fill
 295                 * ps_matched yet. Once it can, we can avoid calling
 296                 * match_pathspec() for _all_ entries when
 297                 * opts->source_tree != NULL.
 298                 */
 299                if (ce_path_match(ce, &opts->pathspec, ps_matched))
 300                        ce->ce_flags |= CE_MATCHED;
 301        }
 302
 303        if (report_path_error(ps_matched, &opts->pathspec, opts->prefix)) {
 304                free(ps_matched);
 305                return 1;
 306        }
 307        free(ps_matched);
 308
 309        /* "checkout -m path" to recreate conflicted state */
 310        if (opts->merge)
 311                unmerge_marked_index(&the_index);
 312
 313        /* Any unmerged paths? */
 314        for (pos = 0; pos < active_nr; pos++) {
 315                const struct cache_entry *ce = active_cache[pos];
 316                if (ce->ce_flags & CE_MATCHED) {
 317                        if (!ce_stage(ce))
 318                                continue;
 319                        if (opts->force) {
 320                                warning(_("path '%s' is unmerged"), ce->name);
 321                        } else if (opts->writeout_stage) {
 322                                errs |= check_stage(opts->writeout_stage, ce, pos);
 323                        } else if (opts->merge) {
 324                                errs |= check_stages((1<<2) | (1<<3), ce, pos);
 325                        } else {
 326                                errs = 1;
 327                                error(_("path '%s' is unmerged"), ce->name);
 328                        }
 329                        pos = skip_same_name(ce, pos) - 1;
 330                }
 331        }
 332        if (errs)
 333                return 1;
 334
 335        /* Now we are committed to check them out */
 336        memset(&state, 0, sizeof(state));
 337        state.force = 1;
 338        state.refresh_cache = 1;
 339        state.istate = &the_index;
 340        for (pos = 0; pos < active_nr; pos++) {
 341                struct cache_entry *ce = active_cache[pos];
 342                if (ce->ce_flags & CE_MATCHED) {
 343                        if (!ce_stage(ce)) {
 344                                errs |= checkout_entry(ce, &state, NULL);
 345                                continue;
 346                        }
 347                        if (opts->writeout_stage)
 348                                errs |= checkout_stage(opts->writeout_stage, ce, pos, &state);
 349                        else if (opts->merge)
 350                                errs |= checkout_merged(pos, &state);
 351                        pos = skip_same_name(ce, pos) - 1;
 352                }
 353        }
 354
 355        if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
 356                die(_("unable to write new index file"));
 357
 358        read_ref_full("HEAD", 0, rev, &flag);
 359        head = lookup_commit_reference_gently(rev, 1);
 360
 361        errs |= post_checkout_hook(head, head, 0);
 362        return errs;
 363}
 364
 365static void show_local_changes(struct object *head,
 366                               const struct diff_options *opts)
 367{
 368        struct rev_info rev;
 369        /* I think we want full paths, even if we're in a subdirectory. */
 370        init_revisions(&rev, NULL);
 371        rev.diffopt.flags = opts->flags;
 372        rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
 373        diff_setup_done(&rev.diffopt);
 374        add_pending_object(&rev, head, NULL);
 375        run_diff_index(&rev, 0);
 376}
 377
 378static void describe_detached_head(const char *msg, struct commit *commit)
 379{
 380        struct strbuf sb = STRBUF_INIT;
 381        if (!parse_commit(commit))
 382                pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
 383        fprintf(stderr, "%s %s... %s\n", msg,
 384                find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf);
 385        strbuf_release(&sb);
 386}
 387
 388static int reset_tree(struct tree *tree, const struct checkout_opts *o,
 389                      int worktree, int *writeout_error)
 390{
 391        struct unpack_trees_options opts;
 392        struct tree_desc tree_desc;
 393
 394        memset(&opts, 0, sizeof(opts));
 395        opts.head_idx = -1;
 396        opts.update = worktree;
 397        opts.skip_unmerged = !worktree;
 398        opts.reset = 1;
 399        opts.merge = 1;
 400        opts.fn = oneway_merge;
 401        opts.verbose_update = !o->quiet && isatty(2);
 402        opts.src_index = &the_index;
 403        opts.dst_index = &the_index;
 404        parse_tree(tree);
 405        init_tree_desc(&tree_desc, tree->buffer, tree->size);
 406        switch (unpack_trees(1, &tree_desc, &opts)) {
 407        case -2:
 408                *writeout_error = 1;
 409                /*
 410                 * We return 0 nevertheless, as the index is all right
 411                 * and more importantly we have made best efforts to
 412                 * update paths in the work tree, and we cannot revert
 413                 * them.
 414                 */
 415        case 0:
 416                return 0;
 417        default:
 418                return 128;
 419        }
 420}
 421
 422struct branch_info {
 423        const char *name; /* The short name used */
 424        const char *path; /* The full name of a real branch */
 425        struct commit *commit; /* The named commit */
 426        /*
 427         * if not null the branch is detached because it's already
 428         * checked out in this checkout
 429         */
 430        char *checkout;
 431};
 432
 433static void setup_branch_path(struct branch_info *branch)
 434{
 435        struct strbuf buf = STRBUF_INIT;
 436
 437        strbuf_branchname(&buf, branch->name);
 438        if (strcmp(buf.buf, branch->name))
 439                branch->name = xstrdup(buf.buf);
 440        strbuf_splice(&buf, 0, 0, "refs/heads/", 11);
 441        branch->path = strbuf_detach(&buf, NULL);
 442}
 443
 444static int merge_working_tree(const struct checkout_opts *opts,
 445                              struct branch_info *old,
 446                              struct branch_info *new,
 447                              int *writeout_error)
 448{
 449        int ret;
 450        struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 451
 452        hold_locked_index(lock_file, 1);
 453        if (read_cache_preload(NULL) < 0)
 454                return error(_("corrupt index file"));
 455
 456        resolve_undo_clear();
 457        if (opts->force) {
 458                ret = reset_tree(new->commit->tree, opts, 1, writeout_error);
 459                if (ret)
 460                        return ret;
 461        } else {
 462                struct tree_desc trees[2];
 463                struct tree *tree;
 464                struct unpack_trees_options topts;
 465
 466                memset(&topts, 0, sizeof(topts));
 467                topts.head_idx = -1;
 468                topts.src_index = &the_index;
 469                topts.dst_index = &the_index;
 470
 471                setup_unpack_trees_porcelain(&topts, "checkout");
 472
 473                refresh_cache(REFRESH_QUIET);
 474
 475                if (unmerged_cache()) {
 476                        error(_("you need to resolve your current index first"));
 477                        return 1;
 478                }
 479
 480                /* 2-way merge to the new branch */
 481                topts.initial_checkout = is_cache_unborn();
 482                topts.update = 1;
 483                topts.merge = 1;
 484                topts.gently = opts->merge && old->commit;
 485                topts.verbose_update = !opts->quiet && isatty(2);
 486                topts.fn = twoway_merge;
 487                if (opts->overwrite_ignore) {
 488                        topts.dir = xcalloc(1, sizeof(*topts.dir));
 489                        topts.dir->flags |= DIR_SHOW_IGNORED;
 490                        setup_standard_excludes(topts.dir);
 491                }
 492                tree = parse_tree_indirect(old->commit ?
 493                                           old->commit->object.sha1 :
 494                                           EMPTY_TREE_SHA1_BIN);
 495                init_tree_desc(&trees[0], tree->buffer, tree->size);
 496                tree = parse_tree_indirect(new->commit->object.sha1);
 497                init_tree_desc(&trees[1], tree->buffer, tree->size);
 498
 499                ret = unpack_trees(2, trees, &topts);
 500                if (ret == -1) {
 501                        /*
 502                         * Unpack couldn't do a trivial merge; either
 503                         * give up or do a real merge, depending on
 504                         * whether the merge flag was used.
 505                         */
 506                        struct tree *result;
 507                        struct tree *work;
 508                        struct merge_options o;
 509                        if (!opts->merge)
 510                                return 1;
 511
 512                        /*
 513                         * Without old->commit, the below is the same as
 514                         * the two-tree unpack we already tried and failed.
 515                         */
 516                        if (!old->commit)
 517                                return 1;
 518
 519                        /* Do more real merge */
 520
 521                        /*
 522                         * We update the index fully, then write the
 523                         * tree from the index, then merge the new
 524                         * branch with the current tree, with the old
 525                         * branch as the base. Then we reset the index
 526                         * (but not the working tree) to the new
 527                         * branch, leaving the working tree as the
 528                         * merged version, but skipping unmerged
 529                         * entries in the index.
 530                         */
 531
 532                        add_files_to_cache(NULL, NULL, 0);
 533                        /*
 534                         * NEEDSWORK: carrying over local changes
 535                         * when branches have different end-of-line
 536                         * normalization (or clean+smudge rules) is
 537                         * a pain; plumb in an option to set
 538                         * o.renormalize?
 539                         */
 540                        init_merge_options(&o);
 541                        o.verbosity = 0;
 542                        work = write_tree_from_memory(&o);
 543
 544                        ret = reset_tree(new->commit->tree, opts, 1,
 545                                         writeout_error);
 546                        if (ret)
 547                                return ret;
 548                        o.ancestor = old->name;
 549                        o.branch1 = new->name;
 550                        o.branch2 = "local";
 551                        merge_trees(&o, new->commit->tree, work,
 552                                old->commit->tree, &result);
 553                        ret = reset_tree(new->commit->tree, opts, 0,
 554                                         writeout_error);
 555                        if (ret)
 556                                return ret;
 557                }
 558        }
 559
 560        if (!active_cache_tree)
 561                active_cache_tree = cache_tree();
 562
 563        if (!cache_tree_fully_valid(active_cache_tree))
 564                cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
 565
 566        if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
 567                die(_("unable to write new index file"));
 568
 569        if (!opts->force && !opts->quiet)
 570                show_local_changes(&new->commit->object, &opts->diff_options);
 571
 572        return 0;
 573}
 574
 575static void report_tracking(struct branch_info *new)
 576{
 577        struct strbuf sb = STRBUF_INIT;
 578        struct branch *branch = branch_get(new->name);
 579
 580        if (!format_tracking_info(branch, &sb))
 581                return;
 582        fputs(sb.buf, stdout);
 583        strbuf_release(&sb);
 584}
 585
 586static void update_refs_for_switch(const struct checkout_opts *opts,
 587                                   struct branch_info *old,
 588                                   struct branch_info *new)
 589{
 590        struct strbuf msg = STRBUF_INIT;
 591        const char *old_desc, *reflog_msg;
 592        if (opts->new_branch) {
 593                if (opts->new_orphan_branch) {
 594                        if (opts->new_branch_log && !log_all_ref_updates) {
 595                                int temp;
 596                                struct strbuf log_file = STRBUF_INIT;
 597                                int ret;
 598                                const char *ref_name;
 599
 600                                ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch);
 601                                temp = log_all_ref_updates;
 602                                log_all_ref_updates = 1;
 603                                ret = log_ref_setup(ref_name, &log_file);
 604                                log_all_ref_updates = temp;
 605                                strbuf_release(&log_file);
 606                                if (ret) {
 607                                        fprintf(stderr, _("Can not do reflog for '%s'\n"),
 608                                            opts->new_orphan_branch);
 609                                        return;
 610                                }
 611                        }
 612                }
 613                else
 614                        create_branch(old->name, opts->new_branch, new->name,
 615                                      opts->new_branch_force ? 1 : 0,
 616                                      opts->new_branch_log,
 617                                      opts->new_branch_force ? 1 : 0,
 618                                      opts->quiet,
 619                                      opts->track);
 620                new->name = opts->new_branch;
 621                setup_branch_path(new);
 622        }
 623
 624        old_desc = old->name;
 625        if (!old_desc && old->commit)
 626                old_desc = sha1_to_hex(old->commit->object.sha1);
 627
 628        reflog_msg = getenv("GIT_REFLOG_ACTION");
 629        if (!reflog_msg)
 630                strbuf_addf(&msg, "checkout: moving from %s to %s",
 631                        old_desc ? old_desc : "(invalid)", new->name);
 632        else
 633                strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg));
 634
 635        if (!strcmp(new->name, "HEAD") && !new->path && !opts->force_detach) {
 636                /* Nothing to do. */
 637        } else if (opts->force_detach || !new->path) {  /* No longer on any branch. */
 638                update_ref(msg.buf, "HEAD", new->commit->object.sha1, NULL,
 639                           REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
 640                if (!opts->quiet) {
 641                        if (old->path && advice_detached_head)
 642                                detach_advice(new->name);
 643                        describe_detached_head(_("HEAD is now at"), new->commit);
 644                }
 645        } else if (new->path) { /* Switch branches. */
 646                create_symref("HEAD", new->path, msg.buf);
 647                if (!opts->quiet) {
 648                        if (old->path && !strcmp(new->path, old->path)) {
 649                                if (opts->new_branch_force)
 650                                        fprintf(stderr, _("Reset branch '%s'\n"),
 651                                                new->name);
 652                                else
 653                                        fprintf(stderr, _("Already on '%s'\n"),
 654                                                new->name);
 655                        } else if (opts->new_branch) {
 656                                if (opts->branch_exists)
 657                                        fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
 658                                else
 659                                        fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
 660                        } else {
 661                                fprintf(stderr, _("Switched to branch '%s'\n"),
 662                                        new->name);
 663                        }
 664                }
 665                if (old->path && old->name) {
 666                        if (!ref_exists(old->path) && reflog_exists(old->path))
 667                                delete_reflog(old->path);
 668                }
 669        }
 670        remove_branch_state();
 671        strbuf_release(&msg);
 672        if (!opts->quiet &&
 673            (new->path || (!opts->force_detach && !strcmp(new->name, "HEAD"))))
 674                report_tracking(new);
 675}
 676
 677static int add_pending_uninteresting_ref(const char *refname,
 678                                         const unsigned char *sha1,
 679                                         int flags, void *cb_data)
 680{
 681        add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
 682        return 0;
 683}
 684
 685static void describe_one_orphan(struct strbuf *sb, struct commit *commit)
 686{
 687        strbuf_addstr(sb, "  ");
 688        strbuf_addstr(sb,
 689                find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
 690        strbuf_addch(sb, ' ');
 691        if (!parse_commit(commit))
 692                pp_commit_easy(CMIT_FMT_ONELINE, commit, sb);
 693        strbuf_addch(sb, '\n');
 694}
 695
 696#define ORPHAN_CUTOFF 4
 697static void suggest_reattach(struct commit *commit, struct rev_info *revs)
 698{
 699        struct commit *c, *last = NULL;
 700        struct strbuf sb = STRBUF_INIT;
 701        int lost = 0;
 702        while ((c = get_revision(revs)) != NULL) {
 703                if (lost < ORPHAN_CUTOFF)
 704                        describe_one_orphan(&sb, c);
 705                last = c;
 706                lost++;
 707        }
 708        if (ORPHAN_CUTOFF < lost) {
 709                int more = lost - ORPHAN_CUTOFF;
 710                if (more == 1)
 711                        describe_one_orphan(&sb, last);
 712                else
 713                        strbuf_addf(&sb, _(" ... and %d more.\n"), more);
 714        }
 715
 716        fprintf(stderr,
 717                Q_(
 718                /* The singular version */
 719                "Warning: you are leaving %d commit behind, "
 720                "not connected to\n"
 721                "any of your branches:\n\n"
 722                "%s\n",
 723                /* The plural version */
 724                "Warning: you are leaving %d commits behind, "
 725                "not connected to\n"
 726                "any of your branches:\n\n"
 727                "%s\n",
 728                /* Give ngettext() the count */
 729                lost),
 730                lost,
 731                sb.buf);
 732        strbuf_release(&sb);
 733
 734        if (advice_detached_head)
 735                fprintf(stderr,
 736                        _(
 737                        "If you want to keep them by creating a new branch, "
 738                        "this may be a good time\nto do so with:\n\n"
 739                        " git branch new_branch_name %s\n\n"),
 740                        find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
 741}
 742
 743/*
 744 * We are about to leave commit that was at the tip of a detached
 745 * HEAD.  If it is not reachable from any ref, this is the last chance
 746 * for the user to do so without resorting to reflog.
 747 */
 748static void orphaned_commit_warning(struct commit *old, struct commit *new)
 749{
 750        struct rev_info revs;
 751        struct object *object = &old->object;
 752        struct object_array refs;
 753
 754        init_revisions(&revs, NULL);
 755        setup_revisions(0, NULL, &revs, NULL);
 756
 757        object->flags &= ~UNINTERESTING;
 758        add_pending_object(&revs, object, sha1_to_hex(object->sha1));
 759
 760        for_each_ref(add_pending_uninteresting_ref, &revs);
 761        add_pending_sha1(&revs, "HEAD", new->object.sha1, UNINTERESTING);
 762
 763        refs = revs.pending;
 764        revs.leak_pending = 1;
 765
 766        if (prepare_revision_walk(&revs))
 767                die(_("internal error in revision walk"));
 768        if (!(old->object.flags & UNINTERESTING))
 769                suggest_reattach(old, &revs);
 770        else
 771                describe_detached_head(_("Previous HEAD position was"), old);
 772
 773        clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
 774        free(refs.objects);
 775}
 776
 777static int switch_branches(const struct checkout_opts *opts,
 778                           struct branch_info *new)
 779{
 780        int ret = 0;
 781        struct branch_info old;
 782        void *path_to_free;
 783        unsigned char rev[20];
 784        int flag, writeout_error = 0;
 785        memset(&old, 0, sizeof(old));
 786        old.path = path_to_free = resolve_refdup("HEAD", 0, rev, &flag);
 787        old.commit = lookup_commit_reference_gently(rev, 1);
 788        if (!(flag & REF_ISSYMREF))
 789                old.path = NULL;
 790
 791        if (old.path)
 792                skip_prefix(old.path, "refs/heads/", &old.name);
 793
 794        if (!new->name) {
 795                new->name = "HEAD";
 796                new->commit = old.commit;
 797                if (!new->commit)
 798                        die(_("You are on a branch yet to be born"));
 799                parse_commit_or_die(new->commit);
 800        }
 801
 802        ret = merge_working_tree(opts, &old, new, &writeout_error);
 803        if (ret) {
 804                free(path_to_free);
 805                return ret;
 806        }
 807
 808        if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
 809                orphaned_commit_warning(old.commit, new->commit);
 810
 811        update_refs_for_switch(opts, &old, new);
 812
 813        ret = post_checkout_hook(old.commit, new->commit, 1);
 814        free(path_to_free);
 815        return ret || writeout_error;
 816}
 817
 818static int git_checkout_config(const char *var, const char *value, void *cb)
 819{
 820        if (!strcmp(var, "diff.ignoresubmodules")) {
 821                struct checkout_opts *opts = cb;
 822                handle_ignore_submodules_arg(&opts->diff_options, value);
 823                return 0;
 824        }
 825
 826        if (starts_with(var, "submodule."))
 827                return parse_submodule_config_option(var, value);
 828
 829        return git_xmerge_config(var, value, NULL);
 830}
 831
 832struct tracking_name_data {
 833        /* const */ char *src_ref;
 834        char *dst_ref;
 835        unsigned char *dst_sha1;
 836        int unique;
 837};
 838
 839static int check_tracking_name(struct remote *remote, void *cb_data)
 840{
 841        struct tracking_name_data *cb = cb_data;
 842        struct refspec query;
 843        memset(&query, 0, sizeof(struct refspec));
 844        query.src = cb->src_ref;
 845        if (remote_find_tracking(remote, &query) ||
 846            get_sha1(query.dst, cb->dst_sha1)) {
 847                free(query.dst);
 848                return 0;
 849        }
 850        if (cb->dst_ref) {
 851                free(query.dst);
 852                cb->unique = 0;
 853                return 0;
 854        }
 855        cb->dst_ref = query.dst;
 856        return 0;
 857}
 858
 859static const char *unique_tracking_name(const char *name, unsigned char *sha1)
 860{
 861        struct tracking_name_data cb_data = { NULL, NULL, NULL, 1 };
 862        char src_ref[PATH_MAX];
 863        snprintf(src_ref, PATH_MAX, "refs/heads/%s", name);
 864        cb_data.src_ref = src_ref;
 865        cb_data.dst_sha1 = sha1;
 866        for_each_remote(check_tracking_name, &cb_data);
 867        if (cb_data.unique)
 868                return cb_data.dst_ref;
 869        free(cb_data.dst_ref);
 870        return NULL;
 871}
 872
 873static int parse_branchname_arg(int argc, const char **argv,
 874                                int dwim_new_local_branch_ok,
 875                                struct branch_info *new,
 876                                struct checkout_opts *opts,
 877                                unsigned char rev[20])
 878{
 879        struct tree **source_tree = &opts->source_tree;
 880        const char **new_branch = &opts->new_branch;
 881        int argcount = 0;
 882        unsigned char branch_rev[20];
 883        const char *arg;
 884        int dash_dash_pos;
 885        int has_dash_dash = 0;
 886        int i;
 887
 888        /*
 889         * case 1: git checkout <ref> -- [<paths>]
 890         *
 891         *   <ref> must be a valid tree, everything after the '--' must be
 892         *   a path.
 893         *
 894         * case 2: git checkout -- [<paths>]
 895         *
 896         *   everything after the '--' must be paths.
 897         *
 898         * case 3: git checkout <something> [--]
 899         *
 900         *   (a) If <something> is a commit, that is to
 901         *       switch to the branch or detach HEAD at it.  As a special case,
 902         *       if <something> is A...B (missing A or B means HEAD but you can
 903         *       omit at most one side), and if there is a unique merge base
 904         *       between A and B, A...B names that merge base.
 905         *
 906         *   (b) If <something> is _not_ a commit, either "--" is present
 907         *       or <something> is not a path, no -t or -b was given, and
 908         *       and there is a tracking branch whose name is <something>
 909         *       in one and only one remote, then this is a short-hand to
 910         *       fork local <something> from that remote-tracking branch.
 911         *
 912         *   (c) Otherwise, if "--" is present, treat it like case (1).
 913         *
 914         *   (d) Otherwise :
 915         *       - if it's a reference, treat it like case (1)
 916         *       - else if it's a path, treat it like case (2)
 917         *       - else: fail.
 918         *
 919         * case 4: git checkout <something> <paths>
 920         *
 921         *   The first argument must not be ambiguous.
 922         *   - If it's *only* a reference, treat it like case (1).
 923         *   - If it's only a path, treat it like case (2).
 924         *   - else: fail.
 925         *
 926         */
 927        if (!argc)
 928                return 0;
 929
 930        arg = argv[0];
 931        dash_dash_pos = -1;
 932        for (i = 0; i < argc; i++) {
 933                if (!strcmp(argv[i], "--")) {
 934                        dash_dash_pos = i;
 935                        break;
 936                }
 937        }
 938        if (dash_dash_pos == 0)
 939                return 1; /* case (2) */
 940        else if (dash_dash_pos == 1)
 941                has_dash_dash = 1; /* case (3) or (1) */
 942        else if (dash_dash_pos >= 2)
 943                die(_("only one reference expected, %d given."), dash_dash_pos);
 944
 945        if (!strcmp(arg, "-"))
 946                arg = "@{-1}";
 947
 948        if (get_sha1_mb(arg, rev)) {
 949                /*
 950                 * Either case (3) or (4), with <something> not being
 951                 * a commit, or an attempt to use case (1) with an
 952                 * invalid ref.
 953                 *
 954                 * It's likely an error, but we need to find out if
 955                 * we should auto-create the branch, case (3).(b).
 956                 */
 957                int recover_with_dwim = dwim_new_local_branch_ok;
 958
 959                if (check_filename(NULL, arg) && !has_dash_dash)
 960                        recover_with_dwim = 0;
 961                /*
 962                 * Accept "git checkout foo" and "git checkout foo --"
 963                 * as candidates for dwim.
 964                 */
 965                if (!(argc == 1 && !has_dash_dash) &&
 966                    !(argc == 2 && has_dash_dash))
 967                        recover_with_dwim = 0;
 968
 969                if (recover_with_dwim) {
 970                        const char *remote = unique_tracking_name(arg, rev);
 971                        if (remote) {
 972                                *new_branch = arg;
 973                                arg = remote;
 974                                /* DWIMmed to create local branch, case (3).(b) */
 975                        } else {
 976                                recover_with_dwim = 0;
 977                        }
 978                }
 979
 980                if (!recover_with_dwim) {
 981                        if (has_dash_dash)
 982                                die(_("invalid reference: %s"), arg);
 983                        return argcount;
 984                }
 985        }
 986
 987        /* we can't end up being in (2) anymore, eat the argument */
 988        argcount++;
 989        argv++;
 990        argc--;
 991
 992        new->name = arg;
 993        setup_branch_path(new);
 994
 995        if (!check_refname_format(new->path, 0) &&
 996            !read_ref(new->path, branch_rev))
 997                hashcpy(rev, branch_rev);
 998        else
 999                new->path = NULL; /* not an existing branch */
1000
1001        new->commit = lookup_commit_reference_gently(rev, 1);
1002        if (!new->commit) {
1003                /* not a commit */
1004                *source_tree = parse_tree_indirect(rev);
1005        } else {
1006                parse_commit_or_die(new->commit);
1007                *source_tree = new->commit->tree;
1008        }
1009
1010        if (!*source_tree)                   /* case (1): want a tree */
1011                die(_("reference is not a tree: %s"), arg);
1012        if (!has_dash_dash) {/* case (3).(d) -> (1) */
1013                /*
1014                 * Do not complain the most common case
1015                 *      git checkout branch
1016                 * even if there happen to be a file called 'branch';
1017                 * it would be extremely annoying.
1018                 */
1019                if (argc)
1020                        verify_non_filename(NULL, arg);
1021        } else {
1022                argcount++;
1023                argv++;
1024                argc--;
1025        }
1026
1027        return argcount;
1028}
1029
1030static int switch_unborn_to_new_branch(const struct checkout_opts *opts)
1031{
1032        int status;
1033        struct strbuf branch_ref = STRBUF_INIT;
1034
1035        if (!opts->new_branch)
1036                die(_("You are on a branch yet to be born"));
1037        strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch);
1038        status = create_symref("HEAD", branch_ref.buf, "checkout -b");
1039        strbuf_release(&branch_ref);
1040        if (!opts->quiet)
1041                fprintf(stderr, _("Switched to a new branch '%s'\n"),
1042                        opts->new_branch);
1043        return status;
1044}
1045
1046static int checkout_branch(struct checkout_opts *opts,
1047                           struct branch_info *new)
1048{
1049        if (opts->pathspec.nr)
1050                die(_("paths cannot be used with switching branches"));
1051
1052        if (opts->patch_mode)
1053                die(_("'%s' cannot be used with switching branches"),
1054                    "--patch");
1055
1056        if (opts->writeout_stage)
1057                die(_("'%s' cannot be used with switching branches"),
1058                    "--ours/--theirs");
1059
1060        if (opts->force && opts->merge)
1061                die(_("'%s' cannot be used with '%s'"), "-f", "-m");
1062
1063        if (opts->force_detach && opts->new_branch)
1064                die(_("'%s' cannot be used with '%s'"),
1065                    "--detach", "-b/-B/--orphan");
1066
1067        if (opts->new_orphan_branch) {
1068                if (opts->track != BRANCH_TRACK_UNSPECIFIED)
1069                        die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
1070        } else if (opts->force_detach) {
1071                if (opts->track != BRANCH_TRACK_UNSPECIFIED)
1072                        die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
1073        } else if (opts->track == BRANCH_TRACK_UNSPECIFIED)
1074                opts->track = git_branch_track;
1075
1076        if (new->name && !new->commit)
1077                die(_("Cannot switch branch to a non-commit '%s'"),
1078                    new->name);
1079
1080        if (new->path && !opts->force_detach && !opts->new_branch &&
1081            !opts->ignore_other_worktrees) {
1082                unsigned char sha1[20];
1083                int flag;
1084                char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
1085                if (head_ref &&
1086                    (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
1087                        die_if_checked_out(new->path);
1088                free(head_ref);
1089        }
1090
1091        if (!new->commit && opts->new_branch) {
1092                unsigned char rev[20];
1093                int flag;
1094
1095                if (!read_ref_full("HEAD", 0, rev, &flag) &&
1096                    (flag & REF_ISSYMREF) && is_null_sha1(rev))
1097                        return switch_unborn_to_new_branch(opts);
1098        }
1099        return switch_branches(opts, new);
1100}
1101
1102int cmd_checkout(int argc, const char **argv, const char *prefix)
1103{
1104        struct checkout_opts opts;
1105        struct branch_info new;
1106        char *conflict_style = NULL;
1107        int dwim_new_local_branch = 1;
1108        struct option options[] = {
1109                OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
1110                OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
1111                           N_("create and checkout a new branch")),
1112                OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
1113                           N_("create/reset and checkout a branch")),
1114                OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
1115                OPT_BOOL(0, "detach", &opts.force_detach, N_("detach the HEAD at named commit")),
1116                OPT_SET_INT('t', "track",  &opts.track, N_("set upstream info for new branch"),
1117                        BRANCH_TRACK_EXPLICIT),
1118                OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
1119                OPT_SET_INT('2', "ours", &opts.writeout_stage, N_("checkout our version for unmerged files"),
1120                            2),
1121                OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout their version for unmerged files"),
1122                            3),
1123                OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)")),
1124                OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
1125                OPT_BOOL(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")),
1126                OPT_STRING(0, "conflict", &conflict_style, N_("style"),
1127                           N_("conflict style (merge or diff3)")),
1128                OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
1129                OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree,
1130                         N_("do not limit pathspecs to sparse entries only")),
1131                OPT_HIDDEN_BOOL(0, "guess", &dwim_new_local_branch,
1132                                N_("second guess 'git checkout no-such-branch'")),
1133                OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees,
1134                         N_("do not check if another worktree is holding the given ref")),
1135                OPT_END(),
1136        };
1137
1138        memset(&opts, 0, sizeof(opts));
1139        memset(&new, 0, sizeof(new));
1140        opts.overwrite_ignore = 1;
1141        opts.prefix = prefix;
1142
1143        gitmodules_config();
1144        git_config(git_checkout_config, &opts);
1145
1146        opts.track = BRANCH_TRACK_UNSPECIFIED;
1147
1148        argc = parse_options(argc, argv, prefix, options, checkout_usage,
1149                             PARSE_OPT_KEEP_DASHDASH);
1150
1151        if (conflict_style) {
1152                opts.merge = 1; /* implied */
1153                git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
1154        }
1155
1156        if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)
1157                die(_("-b, -B and --orphan are mutually exclusive"));
1158
1159        /*
1160         * From here on, new_branch will contain the branch to be checked out,
1161         * and new_branch_force and new_orphan_branch will tell us which one of
1162         * -b/-B/--orphan is being used.
1163         */
1164        if (opts.new_branch_force)
1165                opts.new_branch = opts.new_branch_force;
1166
1167        if (opts.new_orphan_branch)
1168                opts.new_branch = opts.new_orphan_branch;
1169
1170        /* --track without -b/-B/--orphan should DWIM */
1171        if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {
1172                const char *argv0 = argv[0];
1173                if (!argc || !strcmp(argv0, "--"))
1174                        die (_("--track needs a branch name"));
1175                skip_prefix(argv0, "refs/", &argv0);
1176                skip_prefix(argv0, "remotes/", &argv0);
1177                argv0 = strchr(argv0, '/');
1178                if (!argv0 || !argv0[1])
1179                        die (_("Missing branch name; try -b"));
1180                opts.new_branch = argv0 + 1;
1181        }
1182
1183        /*
1184         * Extract branch name from command line arguments, so
1185         * all that is left is pathspecs.
1186         *
1187         * Handle
1188         *
1189         *  1) git checkout <tree> -- [<paths>]
1190         *  2) git checkout -- [<paths>]
1191         *  3) git checkout <something> [<paths>]
1192         *
1193         * including "last branch" syntax and DWIM-ery for names of
1194         * remote branches, erroring out for invalid or ambiguous cases.
1195         */
1196        if (argc) {
1197                unsigned char rev[20];
1198                int dwim_ok =
1199                        !opts.patch_mode &&
1200                        dwim_new_local_branch &&
1201                        opts.track == BRANCH_TRACK_UNSPECIFIED &&
1202                        !opts.new_branch;
1203                int n = parse_branchname_arg(argc, argv, dwim_ok,
1204                                             &new, &opts, rev);
1205                argv += n;
1206                argc -= n;
1207        }
1208
1209        if (argc) {
1210                parse_pathspec(&opts.pathspec, 0,
1211                               opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
1212                               prefix, argv);
1213
1214                if (!opts.pathspec.nr)
1215                        die(_("invalid path specification"));
1216
1217                /*
1218                 * Try to give more helpful suggestion.
1219                 * new_branch && argc > 1 will be caught later.
1220                 */
1221                if (opts.new_branch && argc == 1)
1222                        die(_("Cannot update paths and switch to branch '%s' at the same time.\n"
1223                              "Did you intend to checkout '%s' which can not be resolved as commit?"),
1224                            opts.new_branch, argv[0]);
1225
1226                if (opts.force_detach)
1227                        die(_("git checkout: --detach does not take a path argument '%s'"),
1228                            argv[0]);
1229
1230                if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
1231                        die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1232                              "checking out of the index."));
1233        }
1234
1235        if (opts.new_branch) {
1236                struct strbuf buf = STRBUF_INIT;
1237
1238                opts.branch_exists =
1239                        validate_new_branchname(opts.new_branch, &buf,
1240                                                !!opts.new_branch_force,
1241                                                !!opts.new_branch_force);
1242
1243                strbuf_release(&buf);
1244        }
1245
1246        if (opts.patch_mode || opts.pathspec.nr)
1247                return checkout_paths(&opts, new.name);
1248        else
1249                return checkout_branch(&opts, &new);
1250}