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