builtin-checkout.c

   1 #include "cache.h"
   2 #include "builtin.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 "unpack-trees.h"
   9 #include "dir.h"
  10 #include "run-command.h"
  11 #include "merge-recursive.h"
  12 #include "branch.h"
  13 #include "diff.h"
  14 #include "revision.h"
  15 #include "remote.h"
  16 #include "blob.h"
  17 #include "xdiff-interface.h"
  18 #include "ll-merge.h"
  19
  20 static const char * const checkout_usage[] = {
  21         "git checkout [options] <branch>",
  22         "git checkout [options] [<branch>] -- <file>...",
  23         NULL,
  24 };
  25
  26 struct checkout_opts {
  27         int quiet;
  28         int merge;
  29         int force;
  30         int writeout_stage;
  31         int writeout_error;
  32
  33         const char *new_branch;
  34         int new_branch_log;
  35         enum branch_track track;
  36 };
  37
  38 static int post_checkout_hook(struct commit *old, struct commit *new,
  39                               int changed)
  40 {
  41         struct child_process proc;
  42         const char *name = git_path("hooks/post-checkout");
  43         const char *argv[5];
  44
  45         if (access(name, X_OK) < 0)
  46                 return 0;
  47
  48         memset(&proc, 0, sizeof(proc));
  49         argv[0] = name;
  50         argv[1] = xstrdup(sha1_to_hex(old ? old->object.sha1 : null_sha1));
  51         argv[2] = xstrdup(sha1_to_hex(new->object.sha1));
  52         argv[3] = changed ? "1" : "0";
  53         argv[4] = NULL;
  54         proc.argv = argv;
  55         proc.no_stdin = 1;
  56         proc.stdout_to_stderr = 1;
  57         return run_command(&proc);
  58 }
  59
  60 static int update_some(const unsigned char *sha1, const char *base, int baselen,
  61                 const char *pathname, unsigned mode, int stage, void *context)
  62 {
  63         int len;
  64         struct cache_entry *ce;
  65
  66         if (S_ISGITLINK(mode))
  67                 return 0;
  68
  69         if (S_ISDIR(mode))
  70                 return READ_TREE_RECURSIVE;
  71
  72         len = baselen + strlen(pathname);
  73         ce = xcalloc(1, cache_entry_size(len));
  74         hashcpy(ce->sha1, sha1);
  75         memcpy(ce->name, base, baselen);
  76         memcpy(ce->name + baselen, pathname, len - baselen);
  77         ce->ce_flags = create_ce_flags(len, 0);
  78         ce->ce_mode = create_ce_mode(mode);
  79         add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
  80         return 0;
  81 }
  82
  83 static int read_tree_some(struct tree *tree, const char **pathspec)
  84 {
  85         read_tree_recursive(tree, "", 0, 0, pathspec, update_some, NULL);
  86
  87         /* update the index with the given tree's info
  88          * for all args, expanding wildcards, and exit
  89          * with any non-zero return code.
  90          */
  91         return 0;
  92 }
  93
  94 static int skip_same_name(struct cache_entry *ce, int pos)
  95 {
  96         while (++pos < active_nr &&
  97                !strcmp(active_cache[pos]->name, ce->name))
  98                 ; /* skip */
  99         return pos;
 100 }
 101
 102 static int check_stage(int stage, struct cache_entry *ce, int pos)
 103 {
 104         while (pos < active_nr &&
 105                !strcmp(active_cache[pos]->name, ce->name)) {
 106                 if (ce_stage(active_cache[pos]) == stage)
 107                         return 0;
 108                 pos++;
 109         }
 110         return error("path '%s' does not have %s version",
 111                      ce->name,
 112                      (stage == 2) ? "our" : "their");
 113 }
 114
 115 static int check_all_stages(struct cache_entry *ce, int pos)
 116 {
 117         if (ce_stage(ce) != 1 ||
 118             active_nr <= pos + 2 ||
 119             strcmp(active_cache[pos+1]->name, ce->name) ||
 120             ce_stage(active_cache[pos+1]) != 2 ||
 121             strcmp(active_cache[pos+2]->name, ce->name) ||
 122             ce_stage(active_cache[pos+2]) != 3)
 123                 return error("path '%s' does not have all three versions",
 124                              ce->name);
 125         return 0;
 126 }
 127
 128 static int checkout_stage(int stage, struct cache_entry *ce, int pos,
 129                           struct checkout *state)
 130 {
 131         while (pos < active_nr &&
 132                !strcmp(active_cache[pos]->name, ce->name)) {
 133                 if (ce_stage(active_cache[pos]) == stage)
 134                         return checkout_entry(active_cache[pos], state, NULL);
 135                 pos++;
 136         }
 137         return error("path '%s' does not have %s version",
 138                      ce->name,
 139                      (stage == 2) ? "our" : "their");
 140 }
 141
 142 /* NEEDSWORK: share with merge-recursive */
 143 static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
 144 {
 145         unsigned long size;
 146         enum object_type type;
 147
 148         if (!hashcmp(sha1, null_sha1)) {
 149                 mm->ptr = xstrdup("");
 150                 mm->size = 0;
 151                 return;
 152         }
 153
 154         mm->ptr = read_sha1_file(sha1, &type, &size);
 155         if (!mm->ptr || type != OBJ_BLOB)
 156                 die("unable to read blob object %s", sha1_to_hex(sha1));
 157         mm->size = size;
 158 }
 159
 160 static int checkout_merged(int pos, struct checkout *state)
 161 {
 162         struct cache_entry *ce = active_cache[pos];
 163         const char *path = ce->name;
 164         mmfile_t ancestor, ours, theirs;
 165         int status;
 166         unsigned char sha1[20];
 167         mmbuffer_t result_buf;
 168
 169         if (ce_stage(ce) != 1 ||
 170             active_nr <= pos + 2 ||
 171             strcmp(active_cache[pos+1]->name, path) ||
 172             ce_stage(active_cache[pos+1]) != 2 ||
 173             strcmp(active_cache[pos+2]->name, path) ||
 174             ce_stage(active_cache[pos+2]) != 3)
 175                 return error("path '%s' does not have all 3 versions", path);
 176
 177         fill_mm(active_cache[pos]->sha1, &ancestor);
 178         fill_mm(active_cache[pos+1]->sha1, &ours);
 179         fill_mm(active_cache[pos+2]->sha1, &theirs);
 180
 181         status = ll_merge(&result_buf, path, &ancestor,
 182                           &ours, "ours", &theirs, "theirs", 1);
 183         free(ancestor.ptr);
 184         free(ours.ptr);
 185         free(theirs.ptr);
 186         if (status < 0 || !result_buf.ptr) {
 187                 free(result_buf.ptr);
 188                 return error("path '%s': cannot merge", path);
 189         }
 190
 191         /*
 192          * NEEDSWORK:
 193          * There is absolutely no reason to write this as a blob object
 194          * and create a phoney cache entry just to leak.  This hack is
 195          * primarily to get to the write_entry() machinery that massages
 196          * the contents to work-tree format and writes out which only
 197          * allows it for a cache entry.  The code in write_entry() needs
 198          * to be refactored to allow us to feed a <buffer, size, mode>
 199          * instead of a cache entry.  Such a refactoring would help
 200          * merge_recursive as well (it also writes the merge result to the
 201          * object database even when it may contain conflicts).
 202          */
 203         if (write_sha1_file(result_buf.ptr, result_buf.size,
 204                             blob_type, sha1))
 205                 die("Unable to add merge result for '%s'", path);
 206         ce = make_cache_entry(create_ce_mode(active_cache[pos+1]->ce_mode),
 207                               sha1,
 208                               path, 2, 0);
 209         if (!ce)
 210                 die("make_cache_entry failed for path '%s'", path);
 211         status = checkout_entry(ce, state, NULL);
 212         return status;
 213 }
 214
 215 static int checkout_paths(struct tree *source_tree, const char **pathspec,
 216                           struct checkout_opts *opts)
 217 {
 218         int pos;
 219         struct checkout state;
 220         static char *ps_matched;
 221         unsigned char rev[20];
 222         int flag;
 223         struct commit *head;
 224         int errs = 0;
 225         int stage = opts->writeout_stage;
 226         int merge = opts->merge;
 227         int newfd;
 228         struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 229
 230         newfd = hold_locked_index(lock_file, 1);
 231         if (read_cache() < 0)
 232                 return error("corrupt index file");
 233
 234         if (source_tree)
 235                 read_tree_some(source_tree, pathspec);
 236
 237         for (pos = 0; pathspec[pos]; pos++)
 238                 ;
 239         ps_matched = xcalloc(1, pos);
 240
 241         for (pos = 0; pos < active_nr; pos++) {
 242                 struct cache_entry *ce = active_cache[pos];
 243                 pathspec_match(pathspec, ps_matched, ce->name, 0);
 244         }
 245
 246         if (report_path_error(ps_matched, pathspec, 0))
 247                 return 1;
 248
 249         /* Any unmerged paths? */
 250         for (pos = 0; pos < active_nr; pos++) {
 251                 struct cache_entry *ce = active_cache[pos];
 252                 if (pathspec_match(pathspec, NULL, ce->name, 0)) {
 253                         if (!ce_stage(ce))
 254                                 continue;
 255                         if (opts->force) {
 256                                 warning("path '%s' is unmerged", ce->name);
 257                         } else if (stage) {
 258                                 errs |= check_stage(stage, ce, pos);
 259                         } else if (opts->merge) {
 260                                 errs |= check_all_stages(ce, pos);
 261                         } else {
 262                                 errs = 1;
 263                                 error("path '%s' is unmerged", ce->name);
 264                         }
 265                         pos = skip_same_name(ce, pos) - 1;
 266                 }
 267         }
 268         if (errs)
 269                 return 1;
 270
 271         /* Now we are committed to check them out */
 272         memset(&state, 0, sizeof(state));
 273         state.force = 1;
 274         state.refresh_cache = 1;
 275         for (pos = 0; pos < active_nr; pos++) {
 276                 struct cache_entry *ce = active_cache[pos];
 277                 if (pathspec_match(pathspec, NULL, ce->name, 0)) {
 278                         if (!ce_stage(ce)) {
 279                                 errs |= checkout_entry(ce, &state, NULL);
 280                                 continue;
 281                         }
 282                         if (stage)
 283                                 errs |= checkout_stage(stage, ce, pos, &state);
 284                         else if (merge)
 285                                 errs |= checkout_merged(pos, &state);
 286                         pos = skip_same_name(ce, pos) - 1;
 287                 }
 288         }
 289
 290         if (write_cache(newfd, active_cache, active_nr) ||
 291             commit_locked_index(lock_file))
 292                 die("unable to write new index file");
 293
 294         resolve_ref("HEAD", rev, 0, &flag);
 295         head = lookup_commit_reference_gently(rev, 1);
 296
 297         errs |= post_checkout_hook(head, head, 0);
 298         return errs;
 299 }
 300
 301 static void show_local_changes(struct object *head)
 302 {
 303         struct rev_info rev;
 304         /* I think we want full paths, even if we're in a subdirectory. */
 305         init_revisions(&rev, NULL);
 306         rev.abbrev = 0;
 307         rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
 308         add_pending_object(&rev, head, NULL);
 309         run_diff_index(&rev, 0);
 310 }
 311
 312 static void describe_detached_head(char *msg, struct commit *commit)
 313 {
 314         struct strbuf sb = STRBUF_INIT;
 315         parse_commit(commit);
 316         pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, NULL, NULL, 0, 0);
 317         fprintf(stderr, "%s %s... %s\n", msg,
 318                 find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf);
 319         strbuf_release(&sb);
 320 }
 321
 322 static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree)
 323 {
 324         struct unpack_trees_options opts;
 325         struct tree_desc tree_desc;
 326
 327         memset(&opts, 0, sizeof(opts));
 328         opts.head_idx = -1;
 329         opts.update = worktree;
 330         opts.skip_unmerged = !worktree;
 331         opts.reset = 1;
 332         opts.merge = 1;
 333         opts.fn = oneway_merge;
 334         opts.verbose_update = !o->quiet;
 335         opts.src_index = &the_index;
 336         opts.dst_index = &the_index;
 337         parse_tree(tree);
 338         init_tree_desc(&tree_desc, tree->buffer, tree->size);
 339         switch (unpack_trees(1, &tree_desc, &opts)) {
 340         case -2:
 341                 o->writeout_error = 1;
 342                 /*
 343                  * We return 0 nevertheless, as the index is all right
 344                  * and more importantly we have made best efforts to
 345                  * update paths in the work tree, and we cannot revert
 346                  * them.
 347                  */
 348         case 0:
 349                 return 0;
 350         default:
 351                 return 128;
 352         }
 353 }
 354
 355 struct branch_info {
 356         const char *name; /* The short name used */
 357         const char *path; /* The full name of a real branch */
 358         struct commit *commit; /* The named commit */
 359 };
 360
 361 static void setup_branch_path(struct branch_info *branch)
 362 {
 363         struct strbuf buf = STRBUF_INIT;
 364         int ret;
 365
 366         if ((ret = interpret_nth_last_branch(branch->name, &buf))
 367             && ret == strlen(branch->name)) {
 368                 branch->name = xstrdup(buf.buf);
 369                 strbuf_splice(&buf, 0, 0, "refs/heads/", 11);
 370         } else {
 371                 strbuf_addstr(&buf, "refs/heads/");
 372                 strbuf_addstr(&buf, branch->name);
 373         }
 374         branch->path = strbuf_detach(&buf, NULL);
 375 }
 376
 377 static int merge_working_tree(struct checkout_opts *opts,
 378                               struct branch_info *old, struct branch_info *new)
 379 {
 380         int ret;
 381         struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 382         int newfd = hold_locked_index(lock_file, 1);
 383
 384         if (read_cache() < 0)
 385                 return error("corrupt index file");
 386
 387         if (opts->force) {
 388                 ret = reset_tree(new->commit->tree, opts, 1);
 389                 if (ret)
 390                         return ret;
 391         } else {
 392                 struct tree_desc trees[2];
 393                 struct tree *tree;
 394                 struct unpack_trees_options topts;
 395
 396                 memset(&topts, 0, sizeof(topts));
 397                 topts.head_idx = -1;
 398                 topts.src_index = &the_index;
 399                 topts.dst_index = &the_index;
 400
 401                 topts.msgs.not_uptodate_file = "You have local changes to '%s'; cannot switch branches.";
 402
 403                 refresh_cache(REFRESH_QUIET);
 404
 405                 if (unmerged_cache()) {
 406                         error("you need to resolve your current index first");
 407                         return 1;
 408                 }
 409
 410                 /* 2-way merge to the new branch */
 411                 topts.initial_checkout = is_cache_unborn();
 412                 topts.update = 1;
 413                 topts.merge = 1;
 414                 topts.gently = opts->merge;
 415                 topts.verbose_update = !opts->quiet;
 416                 topts.fn = twoway_merge;
 417                 topts.dir = xcalloc(1, sizeof(*topts.dir));
 418                 topts.dir->show_ignored = 1;
 419                 topts.dir->exclude_per_dir = ".gitignore";
 420                 tree = parse_tree_indirect(old->commit->object.sha1);
 421                 init_tree_desc(&trees[0], tree->buffer, tree->size);
 422                 tree = parse_tree_indirect(new->commit->object.sha1);
 423                 init_tree_desc(&trees[1], tree->buffer, tree->size);
 424
 425                 ret = unpack_trees(2, trees, &topts);
 426                 if (ret == -1) {
 427                         /*
 428                          * Unpack couldn't do a trivial merge; either
 429                          * give up or do a real merge, depending on
 430                          * whether the merge flag was used.
 431                          */
 432                         struct tree *result;
 433                         struct tree *work;
 434                         struct merge_options o;
 435                         if (!opts->merge)
 436                                 return 1;
 437                         parse_commit(old->commit);
 438
 439                         /* Do more real merge */
 440
 441                         /*
 442                          * We update the index fully, then write the
 443                          * tree from the index, then merge the new
 444                          * branch with the current tree, with the old
 445                          * branch as the base. Then we reset the index
 446                          * (but not the working tree) to the new
 447                          * branch, leaving the working tree as the
 448                          * merged version, but skipping unmerged
 449                          * entries in the index.
 450                          */
 451
 452                         add_files_to_cache(NULL, NULL, 0);
 453                         init_merge_options(&o);
 454                         o.verbosity = 0;
 455                         work = write_tree_from_memory(&o);
 456
 457                         ret = reset_tree(new->commit->tree, opts, 1);
 458                         if (ret)
 459                                 return ret;
 460                         o.branch1 = new->name;
 461                         o.branch2 = "local";
 462                         merge_trees(&o, new->commit->tree, work,
 463                                 old->commit->tree, &result);
 464                         ret = reset_tree(new->commit->tree, opts, 0);
 465                         if (ret)
 466                                 return ret;
 467                 }
 468         }
 469
 470         if (write_cache(newfd, active_cache, active_nr) ||
 471             commit_locked_index(lock_file))
 472                 die("unable to write new index file");
 473
 474         if (!opts->force && !opts->quiet)
 475                 show_local_changes(&new->commit->object);
 476
 477         return 0;
 478 }
 479
 480 static void report_tracking(struct branch_info *new)
 481 {
 482         struct strbuf sb = STRBUF_INIT;
 483         struct branch *branch = branch_get(new->name);
 484
 485         if (!format_tracking_info(branch, &sb))
 486                 return;
 487         fputs(sb.buf, stdout);
 488         strbuf_release(&sb);
 489 }
 490
 491 static void update_refs_for_switch(struct checkout_opts *opts,
 492                                    struct branch_info *old,
 493                                    struct branch_info *new)
 494 {
 495         struct strbuf msg = STRBUF_INIT;
 496         const char *old_desc;
 497         if (opts->new_branch) {
 498                 create_branch(old->name, opts->new_branch, new->name, 0,
 499                               opts->new_branch_log, opts->track);
 500                 new->name = opts->new_branch;
 501                 setup_branch_path(new);
 502         }
 503
 504         old_desc = old->name;
 505         if (!old_desc && old->commit)
 506                 old_desc = sha1_to_hex(old->commit->object.sha1);
 507         strbuf_addf(&msg, "checkout: moving from %s to %s",
 508                     old_desc ? old_desc : "(invalid)", new->name);
 509
 510         if (new->path) {
 511                 create_symref("HEAD", new->path, msg.buf);
 512                 if (!opts->quiet) {
 513                         if (old->path && !strcmp(new->path, old->path))
 514                                 fprintf(stderr, "Already on \"%s\"\n",
 515                                         new->name);
 516                         else
 517                                 fprintf(stderr, "Switched to%s branch \"%s\"\n",
 518                                         opts->new_branch ? " a new" : "",
 519                                         new->name);
 520                 }
 521         } else if (strcmp(new->name, "HEAD")) {
 522                 update_ref(msg.buf, "HEAD", new->commit->object.sha1, NULL,
 523                            REF_NODEREF, DIE_ON_ERR);
 524                 if (!opts->quiet) {
 525                         if (old->path)
 526                                 fprintf(stderr, "Note: moving to \"%s\" which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n  git checkout -b <new_branch_name>\n", new->name);
 527                         describe_detached_head("HEAD is now at", new->commit);
 528                 }
 529         }
 530         remove_branch_state();
 531         strbuf_release(&msg);
 532         if (!opts->quiet && (new->path || !strcmp(new->name, "HEAD")))
 533                 report_tracking(new);
 534 }
 535
 536 static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
 537 {
 538         int ret = 0;
 539         struct branch_info old;
 540         unsigned char rev[20];
 541         int flag;
 542         memset(&old, 0, sizeof(old));
 543         old.path = resolve_ref("HEAD", rev, 0, &flag);
 544         old.commit = lookup_commit_reference_gently(rev, 1);
 545         if (!(flag & REF_ISSYMREF))
 546                 old.path = NULL;
 547
 548         if (old.path && !prefixcmp(old.path, "refs/heads/"))
 549                 old.name = old.path + strlen("refs/heads/");
 550
 551         if (!new->name) {
 552                 new->name = "HEAD";
 553                 new->commit = old.commit;
 554                 if (!new->commit)
 555                         die("You are on a branch yet to be born");
 556                 parse_commit(new->commit);
 557         }
 558
 559         /*
 560          * If we were on a detached HEAD, but we are now moving to
 561          * a new commit, we want to mention the old commit once more
 562          * to remind the user that it might be lost.
 563          */
 564         if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
 565                 describe_detached_head("Previous HEAD position was", old.commit);
 566
 567         if (!old.commit && !opts->force) {
 568                 if (!opts->quiet) {
 569                         fprintf(stderr, "warning: You appear to be on a branch yet to be born.\n");
 570                         fprintf(stderr, "warning: Forcing checkout of %s.\n", new->name);
 571                 }
 572                 opts->force = 1;
 573         }
 574
 575         ret = merge_working_tree(opts, &old, new);
 576         if (ret)
 577                 return ret;
 578
 579         update_refs_for_switch(opts, &old, new);
 580
 581         ret = post_checkout_hook(old.commit, new->commit, 1);
 582         return ret || opts->writeout_error;
 583 }
 584
 585 static int git_checkout_config(const char *var, const char *value, void *cb)
 586 {
 587         return git_xmerge_config(var, value, cb);
 588 }
 589
 590 int cmd_checkout(int argc, const char **argv, const char *prefix)
 591 {
 592         struct checkout_opts opts;
 593         unsigned char rev[20];
 594         const char *arg;
 595         struct branch_info new;
 596         struct tree *source_tree = NULL;
 597         char *conflict_style = NULL;
 598         struct option options[] = {
 599                 OPT__QUIET(&opts.quiet),
 600                 OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
 601                 OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
 602                 OPT_SET_INT('t', "track",  &opts.track, "track",
 603                         BRANCH_TRACK_EXPLICIT),
 604                 OPT_SET_INT('2', "ours", &opts.writeout_stage, "stage",
 605                             2),
 606                 OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage",
 607                             3),
 608                 OPT_BOOLEAN('f', NULL, &opts.force, "force"),
 609                 OPT_BOOLEAN('m', "merge", &opts.merge, "merge"),
 610                 OPT_STRING(0, "conflict", &conflict_style, "style",
 611                            "conflict style (merge or diff3)"),
 612                 OPT_END(),
 613         };
 614         int has_dash_dash;
 615
 616         memset(&opts, 0, sizeof(opts));
 617         memset(&new, 0, sizeof(new));
 618
 619         git_config(git_checkout_config, NULL);
 620
 621         opts.track = BRANCH_TRACK_UNSPECIFIED;
 622
 623         argc = parse_options(argc, argv, options, checkout_usage,
 624                              PARSE_OPT_KEEP_DASHDASH);
 625
 626         /* --track without -b should DWIM */
 627         if (0 < opts.track && !opts.new_branch) {
 628                 const char *argv0 = argv[0];
 629                 if (!argc || !strcmp(argv0, "--"))
 630                         die ("--track needs a branch name");
 631                 if (!prefixcmp(argv0, "refs/"))
 632                         argv0 += 5;
 633                 if (!prefixcmp(argv0, "remotes/"))
 634                         argv0 += 8;
 635                 argv0 = strchr(argv0, '/');
 636                 if (!argv0 || !argv0[1])
 637                         die ("Missing branch name; try -b");
 638                 opts.new_branch = argv0 + 1;
 639         }
 640
 641         if (opts.track == BRANCH_TRACK_UNSPECIFIED)
 642                 opts.track = git_branch_track;
 643         if (conflict_style) {
 644                 opts.merge = 1; /* implied */
 645                 git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
 646         }
 647
 648         if (opts.force && opts.merge)
 649                 die("git checkout: -f and -m are incompatible");
 650
 651         /*
 652          * case 1: git checkout <ref> -- [<paths>]
 653          *
 654          *   <ref> must be a valid tree, everything after the '--' must be
 655          *   a path.
 656          *
 657          * case 2: git checkout -- [<paths>]
 658          *
 659          *   everything after the '--' must be paths.
 660          *
 661          * case 3: git checkout <something> [<paths>]
 662          *
 663          *   With no paths, if <something> is a commit, that is to
 664          *   switch to the branch or detach HEAD at it.
 665          *
 666          *   Otherwise <something> shall not be ambiguous.
 667          *   - If it's *only* a reference, treat it like case (1).
 668          *   - If it's only a path, treat it like case (2).
 669          *   - else: fail.
 670          *
 671          */
 672         if (argc) {
 673                 if (!strcmp(argv[0], "--")) {       /* case (2) */
 674                         argv++;
 675                         argc--;
 676                         goto no_reference;
 677                 }
 678
 679                 arg = argv[0];
 680                 has_dash_dash = (argc > 1) && !strcmp(argv[1], "--");
 681
 682                 if (!strcmp(arg, "-"))
 683                         arg = "@{-1}";
 684
 685                 if (get_sha1(arg, rev)) {
 686                         if (has_dash_dash)          /* case (1) */
 687                                 die("invalid reference: %s", arg);
 688                         goto no_reference;          /* case (3 -> 2) */
 689                 }
 690
 691                 /* we can't end up being in (2) anymore, eat the argument */
 692                 argv++;
 693                 argc--;
 694
 695                 new.name = arg;
 696                 if ((new.commit = lookup_commit_reference_gently(rev, 1))) {
 697                         setup_branch_path(&new);
 698                         if (resolve_ref(new.path, rev, 1, NULL))
 699                                 new.commit = lookup_commit_reference(rev);
 700                         else
 701                                 new.path = NULL;
 702                         parse_commit(new.commit);
 703                         source_tree = new.commit->tree;
 704                 } else
 705                         source_tree = parse_tree_indirect(rev);
 706
 707                 if (!source_tree)                   /* case (1): want a tree */
 708                         die("reference is not a tree: %s", arg);
 709                 if (!has_dash_dash) {/* case (3 -> 1) */
 710                         /*
 711                          * Do not complain the most common case
 712                          *      git checkout branch
 713                          * even if there happen to be a file called 'branch';
 714                          * it would be extremely annoying.
 715                          */
 716                         if (argc)
 717                                 verify_non_filename(NULL, arg);
 718                 }
 719                 else {
 720                         argv++;
 721                         argc--;
 722                 }
 723         }
 724
 725 no_reference:
 726         if (argc) {
 727                 const char **pathspec = get_pathspec(prefix, argv);
 728
 729                 if (!pathspec)
 730                         die("invalid path specification");
 731
 732                 /* Checkout paths */
 733                 if (opts.new_branch) {
 734                         if (argc == 1) {
 735                                 die("git checkout: updating paths is incompatible with switching branches.\nDid you intend to checkout '%s' which can not be resolved as commit?", argv[0]);
 736                         } else {
 737                                 die("git checkout: updating paths is incompatible with switching branches.");
 738                         }
 739                 }
 740
 741                 if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
 742                         die("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index.");
 743
 744                 return checkout_paths(source_tree, pathspec, &opts);
 745         }
 746
 747         if (opts.new_branch) {
 748                 struct strbuf buf = STRBUF_INIT;
 749                 strbuf_addstr(&buf, "refs/heads/");
 750                 strbuf_addstr(&buf, opts.new_branch);
 751                 if (!get_sha1(buf.buf, rev))
 752                         die("git checkout: branch %s already exists", opts.new_branch);
 753                 if (check_ref_format(buf.buf))
 754                         die("git checkout: we do not like '%s' as a branch name.", opts.new_branch);
 755                 strbuf_release(&buf);
 756         }
 757
 758         if (new.name && !new.commit) {
 759                 die("Cannot switch branch to a non-commit.");
 760         }
 761         if (opts.writeout_stage)
 762                 die("--ours/--theirs is incompatible with switching branches.");
 763
 764         return switch_branches(&opts, &new);
 765 }