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