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