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