status: do not depend on rebase reflog messages
[git/git.git] / builtin / checkout.c
CommitLineData
782c2d65
DB
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"
b9d37a54 8#include "cache-tree.h"
782c2d65
DB
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"
79a1e6b4 16#include "remote.h"
0cf8581e
JH
17#include "blob.h"
18#include "xdiff-interface.h"
19#include "ll-merge.h"
cfc5789a 20#include "resolve-undo.h"
175f6e59 21#include "submodule.h"
7bf0b017 22#include "argv-array.h"
782c2d65
DB
23
24static const char * const checkout_usage[] = {
e05a1093
NTND
25 N_("git checkout [options] <branch>"),
26 N_("git checkout [options] [<branch>] -- <file>..."),
782c2d65
DB
27 NULL,
28};
29
db941099 30struct checkout_opts {
e51e3057 31 int patch_mode;
db941099
JH
32 int quiet;
33 int merge;
34 int force;
32669671 35 int force_detach;
38901a48 36 int writeout_stage;
c1d7036b 37 int overwrite_ignore;
08d595dc 38 int ignore_skipworktree;
db941099
JH
39
40 const char *new_branch;
02ac9837 41 const char *new_branch_force;
9db5ebf4 42 const char *new_orphan_branch;
db941099
JH
43 int new_branch_log;
44 enum branch_track track;
175f6e59 45 struct diff_options diff_options;
e51e3057
NTND
46
47 int branch_exists;
48 const char *prefix;
49 const char **pathspec;
50 struct tree *source_tree;
db941099
JH
51};
52
782c2d65
DB
53static int post_checkout_hook(struct commit *old, struct commit *new,
54 int changed)
55{
ae98a008
SB
56 return run_hook(NULL, "post-checkout",
57 sha1_to_hex(old ? old->object.sha1 : null_sha1),
58 sha1_to_hex(new ? new->object.sha1 : null_sha1),
59 changed ? "1" : "0", NULL);
2292ce47
SB
60 /* "new" can be NULL when checking out from the index before
61 a commit exists. */
ae98a008 62
782c2d65
DB
63}
64
65static int update_some(const unsigned char *sha1, const char *base, int baselen,
671f0707 66 const char *pathname, unsigned mode, int stage, void *context)
782c2d65
DB
67{
68 int len;
69 struct cache_entry *ce;
70
782c2d65
DB
71 if (S_ISDIR(mode))
72 return READ_TREE_RECURSIVE;
73
74 len = baselen + strlen(pathname);
75 ce = xcalloc(1, cache_entry_size(len));
76 hashcpy(ce->sha1, sha1);
77 memcpy(ce->name, base, baselen);
78 memcpy(ce->name + baselen, pathname, len - baselen);
b60e188c
TG
79 ce->ce_flags = create_ce_flags(0) | CE_UPDATE;
80 ce->ce_namelen = len;
782c2d65
DB
81 ce->ce_mode = create_ce_mode(mode);
82 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
83 return 0;
84}
85
86static int read_tree_some(struct tree *tree, const char **pathspec)
87{
f0096c06
NTND
88 struct pathspec ps;
89 init_pathspec(&ps, pathspec);
90 read_tree_recursive(tree, "", 0, 0, &ps, update_some, NULL);
91 free_pathspec(&ps);
782c2d65 92
782c2d65
DB
93 /* update the index with the given tree's info
94 * for all args, expanding wildcards, and exit
95 * with any non-zero return code.
96 */
97 return 0;
98}
99
8fdcf312
JH
100static int skip_same_name(struct cache_entry *ce, int pos)
101{
102 while (++pos < active_nr &&
103 !strcmp(active_cache[pos]->name, ce->name))
104 ; /* skip */
105 return pos;
106}
107
38901a48
JH
108static int check_stage(int stage, struct cache_entry *ce, int pos)
109{
110 while (pos < active_nr &&
111 !strcmp(active_cache[pos]->name, ce->name)) {
112 if (ce_stage(active_cache[pos]) == stage)
113 return 0;
114 pos++;
115 }
9f97ab08
ÆAB
116 if (stage == 2)
117 return error(_("path '%s' does not have our version"), ce->name);
118 else
119 return error(_("path '%s' does not have their version"), ce->name);
38901a48
JH
120}
121
fbbccd0a 122static int check_stages(unsigned stages, struct cache_entry *ce, int pos)
0cf8581e 123{
fbbccd0a
JH
124 unsigned seen = 0;
125 const char *name = ce->name;
126
127 while (pos < active_nr) {
128 ce = active_cache[pos];
129 if (strcmp(name, ce->name))
130 break;
131 seen |= (1 << ce_stage(ce));
132 pos++;
133 }
134 if ((stages & seen) != stages)
135 return error(_("path '%s' does not have all necessary versions"),
136 name);
0cf8581e
JH
137 return 0;
138}
139
38901a48
JH
140static int checkout_stage(int stage, struct cache_entry *ce, int pos,
141 struct checkout *state)
142{
143 while (pos < active_nr &&
144 !strcmp(active_cache[pos]->name, ce->name)) {
145 if (ce_stage(active_cache[pos]) == stage)
146 return checkout_entry(active_cache[pos], state, NULL);
147 pos++;
148 }
9f97ab08
ÆAB
149 if (stage == 2)
150 return error(_("path '%s' does not have our version"), ce->name);
151 else
152 return error(_("path '%s' does not have their version"), ce->name);
38901a48 153}
8fdcf312 154
0cf8581e
JH
155static int checkout_merged(int pos, struct checkout *state)
156{
157 struct cache_entry *ce = active_cache[pos];
158 const char *path = ce->name;
159 mmfile_t ancestor, ours, theirs;
160 int status;
161 unsigned char sha1[20];
162 mmbuffer_t result_buf;
fbbccd0a 163 unsigned char threeway[3][20];
335c6e40 164 unsigned mode = 0;
0cf8581e 165
fbbccd0a
JH
166 memset(threeway, 0, sizeof(threeway));
167 while (pos < active_nr) {
168 int stage;
169 stage = ce_stage(ce);
170 if (!stage || strcmp(path, ce->name))
171 break;
172 hashcpy(threeway[stage - 1], ce->sha1);
173 if (stage == 2)
174 mode = create_ce_mode(ce->ce_mode);
175 pos++;
176 ce = active_cache[pos];
177 }
178 if (is_null_sha1(threeway[1]) || is_null_sha1(threeway[2]))
179 return error(_("path '%s' does not have necessary versions"), path);
0cf8581e 180
fbbccd0a
JH
181 read_mmblob(&ancestor, threeway[0]);
182 read_mmblob(&ours, threeway[1]);
183 read_mmblob(&theirs, threeway[2]);
0cf8581e 184
18b037a5
JN
185 /*
186 * NEEDSWORK: re-create conflicts from merges with
187 * merge.renormalize set, too
188 */
f0531a29 189 status = ll_merge(&result_buf, path, &ancestor, "base",
712516bc 190 &ours, "ours", &theirs, "theirs", NULL);
0cf8581e
JH
191 free(ancestor.ptr);
192 free(ours.ptr);
193 free(theirs.ptr);
194 if (status < 0 || !result_buf.ptr) {
195 free(result_buf.ptr);
e8a8a4d7 196 return error(_("path '%s': cannot merge"), path);
0cf8581e
JH
197 }
198
199 /*
200 * NEEDSWORK:
201 * There is absolutely no reason to write this as a blob object
3ea3c215 202 * and create a phony cache entry just to leak. This hack is
0cf8581e
JH
203 * primarily to get to the write_entry() machinery that massages
204 * the contents to work-tree format and writes out which only
205 * allows it for a cache entry. The code in write_entry() needs
206 * to be refactored to allow us to feed a <buffer, size, mode>
207 * instead of a cache entry. Such a refactoring would help
208 * merge_recursive as well (it also writes the merge result to the
209 * object database even when it may contain conflicts).
210 */
211 if (write_sha1_file(result_buf.ptr, result_buf.size,
212 blob_type, sha1))
e8a8a4d7 213 die(_("Unable to add merge result for '%s'"), path);
fbbccd0a 214 ce = make_cache_entry(mode, sha1, path, 2, 0);
048f2762 215 if (!ce)
e8a8a4d7 216 die(_("make_cache_entry failed for path '%s'"), path);
0cf8581e
JH
217 status = checkout_entry(ce, state, NULL);
218 return status;
219}
8fdcf312 220
b6312c27
NTND
221static int checkout_paths(const struct checkout_opts *opts,
222 const char *revision)
782c2d65
DB
223{
224 int pos;
225 struct checkout state;
226 static char *ps_matched;
227 unsigned char rev[20];
228 int flag;
229 struct commit *head;
d2b3691b 230 int errs = 0;
38901a48 231 int stage = opts->writeout_stage;
0cf8581e 232 int merge = opts->merge;
75336878 233 int newfd;
b6312c27
NTND
234 struct lock_file *lock_file;
235
236 if (opts->track != BRANCH_TRACK_UNSPECIFIED)
237 die(_("'%s' cannot be used with updating paths"), "--track");
238
239 if (opts->new_branch_log)
240 die(_("'%s' cannot be used with updating paths"), "-l");
241
242 if (opts->force && opts->patch_mode)
243 die(_("'%s' cannot be used with updating paths"), "-f");
244
245 if (opts->force_detach)
246 die(_("'%s' cannot be used with updating paths"), "--detach");
247
248 if (opts->merge && opts->patch_mode)
249 die(_("'%s' cannot be used with %s"), "--merge", "--patch");
250
251 if (opts->force && opts->merge)
252 die(_("'%s' cannot be used with %s"), "-f", "-m");
253
254 if (opts->new_branch)
255 die(_("Cannot update paths and switch to branch '%s' at the same time."),
256 opts->new_branch);
257
258 if (opts->patch_mode)
259 return run_add_interactive(revision, "--patch=checkout",
260 opts->pathspec);
261
262 lock_file = xcalloc(1, sizeof(struct lock_file));
75336878
DB
263
264 newfd = hold_locked_index(lock_file, 1);
e51e3057 265 if (read_cache_preload(opts->pathspec) < 0)
e8a8a4d7 266 return error(_("corrupt index file"));
75336878 267
e51e3057
NTND
268 if (opts->source_tree)
269 read_tree_some(opts->source_tree, opts->pathspec);
75336878 270
e51e3057 271 for (pos = 0; opts->pathspec[pos]; pos++)
782c2d65
DB
272 ;
273 ps_matched = xcalloc(1, pos);
274
e721c154
NTND
275 /*
276 * Make sure all pathspecs participated in locating the paths
277 * to be checked out.
278 */
782c2d65
DB
279 for (pos = 0; pos < active_nr; pos++) {
280 struct cache_entry *ce = active_cache[pos];
e721c154 281 ce->ce_flags &= ~CE_MATCHED;
08d595dc
NTND
282 if (!opts->ignore_skipworktree && ce_skip_worktree(ce))
283 continue;
e51e3057 284 if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
e721c154
NTND
285 /*
286 * "git checkout tree-ish -- path", but this entry
287 * is in the original index; it will not be checked
288 * out to the working tree and it does not matter
289 * if pathspec matched this entry. We will not do
290 * anything to this entry at all.
291 */
0a1283bc 292 continue;
e721c154
NTND
293 /*
294 * Either this entry came from the tree-ish we are
295 * checking the paths out of, or we are checking out
296 * of the index.
297 *
298 * If it comes from the tree-ish, we already know it
299 * matches the pathspec and could just stamp
300 * CE_MATCHED to it from update_some(). But we still
301 * need ps_matched and read_tree_recursive (and
302 * eventually tree_entry_interesting) cannot fill
303 * ps_matched yet. Once it can, we can avoid calling
304 * match_pathspec() for _all_ entries when
305 * opts->source_tree != NULL.
306 */
307 if (match_pathspec(opts->pathspec, ce->name, ce_namelen(ce),
308 0, ps_matched))
309 ce->ce_flags |= CE_MATCHED;
782c2d65
DB
310 }
311
e721c154
NTND
312 if (report_path_error(ps_matched, opts->pathspec, opts->prefix)) {
313 free(ps_matched);
782c2d65 314 return 1;
e721c154
NTND
315 }
316 free(ps_matched);
782c2d65 317
4421a823
JH
318 /* "checkout -m path" to recreate conflicted state */
319 if (opts->merge)
e721c154 320 unmerge_marked_index(&the_index);
4421a823 321
8fdcf312
JH
322 /* Any unmerged paths? */
323 for (pos = 0; pos < active_nr; pos++) {
324 struct cache_entry *ce = active_cache[pos];
e721c154 325 if (ce->ce_flags & CE_MATCHED) {
8fdcf312
JH
326 if (!ce_stage(ce))
327 continue;
db941099 328 if (opts->force) {
e8a8a4d7 329 warning(_("path '%s' is unmerged"), ce->name);
38901a48
JH
330 } else if (stage) {
331 errs |= check_stage(stage, ce, pos);
0cf8581e 332 } else if (opts->merge) {
fbbccd0a 333 errs |= check_stages((1<<2) | (1<<3), ce, pos);
db941099
JH
334 } else {
335 errs = 1;
e8a8a4d7 336 error(_("path '%s' is unmerged"), ce->name);
db941099 337 }
8fdcf312
JH
338 pos = skip_same_name(ce, pos) - 1;
339 }
340 }
341 if (errs)
342 return 1;
343
d2b3691b 344 /* Now we are committed to check them out */
782c2d65
DB
345 memset(&state, 0, sizeof(state));
346 state.force = 1;
347 state.refresh_cache = 1;
348 for (pos = 0; pos < active_nr; pos++) {
349 struct cache_entry *ce = active_cache[pos];
e721c154 350 if (ce->ce_flags & CE_MATCHED) {
8fdcf312
JH
351 if (!ce_stage(ce)) {
352 errs |= checkout_entry(ce, &state, NULL);
353 continue;
354 }
38901a48
JH
355 if (stage)
356 errs |= checkout_stage(stage, ce, pos, &state);
0cf8581e
JH
357 else if (merge)
358 errs |= checkout_merged(pos, &state);
8fdcf312 359 pos = skip_same_name(ce, pos) - 1;
782c2d65
DB
360 }
361 }
362
75336878
DB
363 if (write_cache(newfd, active_cache, active_nr) ||
364 commit_locked_index(lock_file))
e8a8a4d7 365 die(_("unable to write new index file"));
75336878 366
c6893323 367 read_ref_full("HEAD", rev, 0, &flag);
782c2d65
DB
368 head = lookup_commit_reference_gently(rev, 1);
369
d2b3691b
JH
370 errs |= post_checkout_hook(head, head, 0);
371 return errs;
782c2d65
DB
372}
373
a2b4994c
NTND
374static void show_local_changes(struct object *head,
375 const struct diff_options *opts)
782c2d65
DB
376{
377 struct rev_info rev;
378 /* I think we want full paths, even if we're in a subdirectory. */
379 init_revisions(&rev, NULL);
175f6e59 380 rev.diffopt.flags = opts->flags;
782c2d65 381 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
28452655 382 diff_setup_done(&rev.diffopt);
782c2d65
DB
383 add_pending_object(&rev, head, NULL);
384 run_diff_index(&rev, 0);
385}
386
b3c0494a 387static void describe_detached_head(const char *msg, struct commit *commit)
782c2d65 388{
f285a2d7 389 struct strbuf sb = STRBUF_INIT;
782c2d65 390 parse_commit(commit);
8b8a5374 391 pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
782c2d65
DB
392 fprintf(stderr, "%s %s... %s\n", msg,
393 find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf);
394 strbuf_release(&sb);
395}
396
a2b4994c
NTND
397static int reset_tree(struct tree *tree, const struct checkout_opts *o,
398 int worktree, int *writeout_error)
782c2d65
DB
399{
400 struct unpack_trees_options opts;
401 struct tree_desc tree_desc;
bc052d7f 402
782c2d65
DB
403 memset(&opts, 0, sizeof(opts));
404 opts.head_idx = -1;
6286a08d
JH
405 opts.update = worktree;
406 opts.skip_unmerged = !worktree;
782c2d65
DB
407 opts.reset = 1;
408 opts.merge = 1;
409 opts.fn = oneway_merge;
e9fc64c6 410 opts.verbose_update = !o->quiet && isatty(2);
34110cd4
LT
411 opts.src_index = &the_index;
412 opts.dst_index = &the_index;
782c2d65
DB
413 parse_tree(tree);
414 init_tree_desc(&tree_desc, tree->buffer, tree->size);
291d823e
JH
415 switch (unpack_trees(1, &tree_desc, &opts)) {
416 case -2:
a2b4994c 417 *writeout_error = 1;
291d823e
JH
418 /*
419 * We return 0 nevertheless, as the index is all right
420 * and more importantly we have made best efforts to
421 * update paths in the work tree, and we cannot revert
422 * them.
423 */
424 case 0:
425 return 0;
426 default:
84a5750b 427 return 128;
291d823e 428 }
782c2d65
DB
429}
430
782c2d65
DB
431struct branch_info {
432 const char *name; /* The short name used */
433 const char *path; /* The full name of a real branch */
434 struct commit *commit; /* The named commit */
435};
436
437static void setup_branch_path(struct branch_info *branch)
438{
f285a2d7 439 struct strbuf buf = STRBUF_INIT;
ae5a6c36 440
a552de75
JH
441 strbuf_branchname(&buf, branch->name);
442 if (strcmp(buf.buf, branch->name))
ae5a6c36 443 branch->name = xstrdup(buf.buf);
a552de75 444 strbuf_splice(&buf, 0, 0, "refs/heads/", 11);
782c2d65
DB
445 branch->path = strbuf_detach(&buf, NULL);
446}
447
a2b4994c
NTND
448static int merge_working_tree(const struct checkout_opts *opts,
449 struct branch_info *old,
450 struct branch_info *new,
451 int *writeout_error)
782c2d65
DB
452{
453 int ret;
454 struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
455 int newfd = hold_locked_index(lock_file, 1);
b96524f8 456
53996fe5 457 if (read_cache_preload(NULL) < 0)
e8a8a4d7 458 return error(_("corrupt index file"));
782c2d65 459
cfc5789a 460 resolve_undo_clear();
782c2d65 461 if (opts->force) {
a2b4994c 462 ret = reset_tree(new->commit->tree, opts, 1, writeout_error);
782c2d65
DB
463 if (ret)
464 return ret;
465 } else {
466 struct tree_desc trees[2];
467 struct tree *tree;
468 struct unpack_trees_options topts;
bc052d7f 469
782c2d65
DB
470 memset(&topts, 0, sizeof(topts));
471 topts.head_idx = -1;
34110cd4
LT
472 topts.src_index = &the_index;
473 topts.dst_index = &the_index;
782c2d65 474
e294030f 475 setup_unpack_trees_porcelain(&topts, "checkout");
8ccba008 476
782c2d65
DB
477 refresh_cache(REFRESH_QUIET);
478
479 if (unmerged_cache()) {
e8a8a4d7 480 error(_("you need to resolve your current index first"));
04c9e11f 481 return 1;
782c2d65 482 }
04c9e11f
JH
483
484 /* 2-way merge to the new branch */
fa7b3c2f 485 topts.initial_checkout = is_cache_unborn();
04c9e11f
JH
486 topts.update = 1;
487 topts.merge = 1;
64da3ae5 488 topts.gently = opts->merge && old->commit;
e9fc64c6 489 topts.verbose_update = !opts->quiet && isatty(2);
04c9e11f 490 topts.fn = twoway_merge;
c1d7036b
NTND
491 if (opts->overwrite_ignore) {
492 topts.dir = xcalloc(1, sizeof(*topts.dir));
493 topts.dir->flags |= DIR_SHOW_IGNORED;
494 setup_standard_excludes(topts.dir);
495 }
cc580af8
JK
496 tree = parse_tree_indirect(old->commit ?
497 old->commit->object.sha1 :
dab0d410 498 EMPTY_TREE_SHA1_BIN);
04c9e11f
JH
499 init_tree_desc(&trees[0], tree->buffer, tree->size);
500 tree = parse_tree_indirect(new->commit->object.sha1);
501 init_tree_desc(&trees[1], tree->buffer, tree->size);
502
291d823e 503 ret = unpack_trees(2, trees, &topts);
49d833dc 504 if (ret == -1) {
782c2d65
DB
505 /*
506 * Unpack couldn't do a trivial merge; either
507 * give up or do a real merge, depending on
508 * whether the merge flag was used.
509 */
510 struct tree *result;
511 struct tree *work;
8a2fce18 512 struct merge_options o;
782c2d65
DB
513 if (!opts->merge)
514 return 1;
64da3ae5
JH
515
516 /*
517 * Without old->commit, the below is the same as
518 * the two-tree unpack we already tried and failed.
519 */
520 if (!old->commit)
521 return 1;
782c2d65
DB
522
523 /* Do more real merge */
524
525 /*
526 * We update the index fully, then write the
527 * tree from the index, then merge the new
528 * branch with the current tree, with the old
529 * branch as the base. Then we reset the index
530 * (but not the working tree) to the new
531 * branch, leaving the working tree as the
532 * merged version, but skipping unmerged
533 * entries in the index.
534 */
535
7ae02a30 536 add_files_to_cache(NULL, NULL, 0);
7610fa57
JN
537 /*
538 * NEEDSWORK: carrying over local changes
539 * when branches have different end-of-line
540 * normalization (or clean+smudge rules) is
541 * a pain; plumb in an option to set
542 * o.renormalize?
543 */
8a2fce18
MV
544 init_merge_options(&o);
545 o.verbosity = 0;
546 work = write_tree_from_memory(&o);
782c2d65 547
a2b4994c
NTND
548 ret = reset_tree(new->commit->tree, opts, 1,
549 writeout_error);
782c2d65
DB
550 if (ret)
551 return ret;
c4151629 552 o.ancestor = old->name;
8a2fce18
MV
553 o.branch1 = new->name;
554 o.branch2 = "local";
555 merge_trees(&o, new->commit->tree, work,
556 old->commit->tree, &result);
a2b4994c
NTND
557 ret = reset_tree(new->commit->tree, opts, 0,
558 writeout_error);
84a5750b
JH
559 if (ret)
560 return ret;
782c2d65
DB
561 }
562 }
563
564 if (write_cache(newfd, active_cache, active_nr) ||
565 commit_locked_index(lock_file))
e8a8a4d7 566 die(_("unable to write new index file"));
782c2d65 567
7fe4a728 568 if (!opts->force && !opts->quiet)
175f6e59 569 show_local_changes(&new->commit->object, &opts->diff_options);
782c2d65
DB
570
571 return 0;
572}
573
6d21bf96 574static void report_tracking(struct branch_info *new)
79a1e6b4 575{
6d21bf96 576 struct strbuf sb = STRBUF_INIT;
b56fca07 577 struct branch *branch = branch_get(new->name);
79a1e6b4 578
6d21bf96 579 if (!format_tracking_info(branch, &sb))
79a1e6b4 580 return;
6d21bf96
JH
581 fputs(sb.buf, stdout);
582 strbuf_release(&sb);
b0030db3 583}
79a1e6b4 584
a2b4994c 585static void update_refs_for_switch(const struct checkout_opts *opts,
782c2d65
DB
586 struct branch_info *old,
587 struct branch_info *new)
588{
f285a2d7 589 struct strbuf msg = STRBUF_INIT;
782c2d65
DB
590 const char *old_desc;
591 if (opts->new_branch) {
3631bf77
EM
592 if (opts->new_orphan_branch) {
593 if (opts->new_branch_log && !log_all_ref_updates) {
594 int temp;
157aaea5 595 char log_file[PATH_MAX];
3631bf77
EM
596 char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch);
597
598 temp = log_all_ref_updates;
599 log_all_ref_updates = 1;
157aaea5 600 if (log_ref_setup(ref_name, log_file, sizeof(log_file))) {
e8a8a4d7 601 fprintf(stderr, _("Can not do reflog for '%s'\n"),
3631bf77
EM
602 opts->new_orphan_branch);
603 log_all_ref_updates = temp;
604 return;
605 }
606 log_all_ref_updates = temp;
607 }
608 }
609 else
02ac9837
TRC
610 create_branch(old->name, opts->new_branch, new->name,
611 opts->new_branch_force ? 1 : 0,
39bd6f72
JN
612 opts->new_branch_log,
613 opts->new_branch_force ? 1 : 0,
f9a482e6 614 opts->quiet,
39bd6f72 615 opts->track);
782c2d65
DB
616 new->name = opts->new_branch;
617 setup_branch_path(new);
618 }
619
782c2d65 620 old_desc = old->name;
323e00fd 621 if (!old_desc && old->commit)
782c2d65
DB
622 old_desc = sha1_to_hex(old->commit->object.sha1);
623 strbuf_addf(&msg, "checkout: moving from %s to %s",
323e00fd 624 old_desc ? old_desc : "(invalid)", new->name);
782c2d65 625
f8bd36a4
JN
626 if (!strcmp(new->name, "HEAD") && !new->path && !opts->force_detach) {
627 /* Nothing to do. */
628 } else if (opts->force_detach || !new->path) { /* No longer on any branch. */
629 update_ref(msg.buf, "HEAD", new->commit->object.sha1, NULL,
630 REF_NODEREF, DIE_ON_ERR);
631 if (!opts->quiet) {
632 if (old->path && advice_detached_head)
2857093b 633 detach_advice(new->name);
6c80cd29 634 describe_detached_head(_("HEAD is now at"), new->commit);
f8bd36a4
JN
635 }
636 } else if (new->path) { /* Switch branches. */
782c2d65
DB
637 create_symref("HEAD", new->path, msg.buf);
638 if (!opts->quiet) {
08eaa4be 639 if (old->path && !strcmp(new->path, old->path)) {
39bd6f72
JN
640 if (opts->new_branch_force)
641 fprintf(stderr, _("Reset branch '%s'\n"),
642 new->name);
643 else
644 fprintf(stderr, _("Already on '%s'\n"),
645 new->name);
08eaa4be
ÆAB
646 } else if (opts->new_branch) {
647 if (opts->branch_exists)
648 fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
649 else
650 fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
651 } else {
e8a8a4d7 652 fprintf(stderr, _("Switched to branch '%s'\n"),
09a0ec58 653 new->name);
08eaa4be 654 }
782c2d65 655 }
3631bf77
EM
656 if (old->path && old->name) {
657 char log_file[PATH_MAX], ref_file[PATH_MAX];
658
659 git_snpath(log_file, sizeof(log_file), "logs/%s", old->path);
660 git_snpath(ref_file, sizeof(ref_file), "%s", old->path);
661 if (!file_exists(ref_file) && file_exists(log_file))
662 remove_path(log_file);
663 }
782c2d65
DB
664 }
665 remove_branch_state();
666 strbuf_release(&msg);
32669671
JH
667 if (!opts->quiet &&
668 (new->path || (!opts->force_detach && !strcmp(new->name, "HEAD"))))
6d21bf96 669 report_tracking(new);
782c2d65
DB
670}
671
468224e5
RS
672static int add_pending_uninteresting_ref(const char *refname,
673 const unsigned char *sha1,
674 int flags, void *cb_data)
8e2dc6ac 675{
add416a6 676 add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
5c08dc48
JK
677 return 0;
678}
8e2dc6ac
JH
679
680static void describe_one_orphan(struct strbuf *sb, struct commit *commit)
681{
8e2dc6ac 682 parse_commit(commit);
0be240cc
JK
683 strbuf_addstr(sb, " ");
684 strbuf_addstr(sb,
685 find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
686 strbuf_addch(sb, ' ');
f67d2e82 687 pp_commit_easy(CMIT_FMT_ONELINE, commit, sb);
8e2dc6ac
JH
688 strbuf_addch(sb, '\n');
689}
690
691#define ORPHAN_CUTOFF 4
692static void suggest_reattach(struct commit *commit, struct rev_info *revs)
693{
694 struct commit *c, *last = NULL;
695 struct strbuf sb = STRBUF_INIT;
696 int lost = 0;
697 while ((c = get_revision(revs)) != NULL) {
698 if (lost < ORPHAN_CUTOFF)
699 describe_one_orphan(&sb, c);
700 last = c;
701 lost++;
702 }
703 if (ORPHAN_CUTOFF < lost) {
704 int more = lost - ORPHAN_CUTOFF;
705 if (more == 1)
706 describe_one_orphan(&sb, last);
707 else
f06f08b7 708 strbuf_addf(&sb, _(" ... and %d more.\n"), more);
8e2dc6ac
JH
709 }
710
711 fprintf(stderr,
f06f08b7
ÆAB
712 Q_(
713 /* The singular version */
714 "Warning: you are leaving %d commit behind, "
715 "not connected to\n"
716 "any of your branches:\n\n"
0faf2474 717 "%s\n",
f06f08b7
ÆAB
718 /* The plural version */
719 "Warning: you are leaving %d commits behind, "
8e2dc6ac
JH
720 "not connected to\n"
721 "any of your branches:\n\n"
f807b3dc 722 "%s\n",
f06f08b7
ÆAB
723 /* Give ngettext() the count */
724 lost),
725 lost,
f807b3dc 726 sb.buf);
8e2dc6ac 727 strbuf_release(&sb);
f807b3dc
JH
728
729 if (advice_detached_head)
730 fprintf(stderr,
0faf2474 731 _(
f807b3dc
JH
732 "If you want to keep them by creating a new branch, "
733 "this may be a good time\nto do so with:\n\n"
0faf2474 734 " git branch new_branch_name %s\n\n"),
d6e14660 735 find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
8e2dc6ac
JH
736}
737
738/*
739 * We are about to leave commit that was at the tip of a detached
740 * HEAD. If it is not reachable from any ref, this is the last chance
741 * for the user to do so without resorting to reflog.
742 */
5d886395 743static void orphaned_commit_warning(struct commit *old, struct commit *new)
8e2dc6ac 744{
8e2dc6ac 745 struct rev_info revs;
5d886395 746 struct object *object = &old->object;
10621419 747 struct object_array refs;
8e2dc6ac
JH
748
749 init_revisions(&revs, NULL);
468224e5
RS
750 setup_revisions(0, NULL, &revs, NULL);
751
752 object->flags &= ~UNINTERESTING;
753 add_pending_object(&revs, object, sha1_to_hex(object->sha1));
754
755 for_each_ref(add_pending_uninteresting_ref, &revs);
5d886395 756 add_pending_sha1(&revs, "HEAD", new->object.sha1, UNINTERESTING);
468224e5 757
10621419
RS
758 refs = revs.pending;
759 revs.leak_pending = 1;
760
8e2dc6ac 761 if (prepare_revision_walk(&revs))
6c80cd29 762 die(_("internal error in revision walk"));
5d886395
JS
763 if (!(old->object.flags & UNINTERESTING))
764 suggest_reattach(old, &revs);
8e2dc6ac 765 else
5d886395 766 describe_detached_head(_("Previous HEAD position was"), old);
5c08dc48 767
86a0a408 768 clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
10621419 769 free(refs.objects);
8e2dc6ac
JH
770}
771
e51e3057
NTND
772static int switch_branches(const struct checkout_opts *opts,
773 struct branch_info *new)
782c2d65
DB
774{
775 int ret = 0;
776 struct branch_info old;
96ec7b1e 777 void *path_to_free;
782c2d65 778 unsigned char rev[20];
a2b4994c 779 int flag, writeout_error = 0;
782c2d65 780 memset(&old, 0, sizeof(old));
96ec7b1e 781 old.path = path_to_free = resolve_refdup("HEAD", rev, 0, &flag);
782c2d65 782 old.commit = lookup_commit_reference_gently(rev, 1);
96ec7b1e 783 if (!(flag & REF_ISSYMREF))
782c2d65
DB
784 old.path = NULL;
785
786 if (old.path && !prefixcmp(old.path, "refs/heads/"))
787 old.name = old.path + strlen("refs/heads/");
788
789 if (!new->name) {
790 new->name = "HEAD";
791 new->commit = old.commit;
792 if (!new->commit)
e8a8a4d7 793 die(_("You are on a branch yet to be born"));
782c2d65
DB
794 parse_commit(new->commit);
795 }
796
a2b4994c 797 ret = merge_working_tree(opts, &old, new, &writeout_error);
96ec7b1e
NTND
798 if (ret) {
799 free(path_to_free);
782c2d65 800 return ret;
96ec7b1e 801 }
782c2d65 802
77ebd56d 803 if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
5d886395 804 orphaned_commit_warning(old.commit, new->commit);
77ebd56d 805
782c2d65
DB
806 update_refs_for_switch(opts, &old, new);
807
291d823e 808 ret = post_checkout_hook(old.commit, new->commit, 1);
96ec7b1e 809 free(path_to_free);
a2b4994c 810 return ret || writeout_error;
782c2d65
DB
811}
812
0cf8581e
JH
813static int git_checkout_config(const char *var, const char *value, void *cb)
814{
175f6e59
JS
815 if (!strcmp(var, "diff.ignoresubmodules")) {
816 struct checkout_opts *opts = cb;
817 handle_ignore_submodules_arg(&opts->diff_options, value);
818 return 0;
819 }
23b4c7bc
JL
820
821 if (!prefixcmp(var, "submodule."))
822 return parse_submodule_config_option(var, value);
823
175f6e59 824 return git_xmerge_config(var, value, NULL);
0cf8581e
JH
825}
826
70c9ac2f
JH
827struct tracking_name_data {
828 const char *name;
829 char *remote;
830 int unique;
831};
832
833static int check_tracking_name(const char *refname, const unsigned char *sha1,
834 int flags, void *cb_data)
835{
836 struct tracking_name_data *cb = cb_data;
837 const char *slash;
838
839 if (prefixcmp(refname, "refs/remotes/"))
840 return 0;
841 slash = strchr(refname + 13, '/');
842 if (!slash || strcmp(slash + 1, cb->name))
843 return 0;
844 if (cb->remote) {
845 cb->unique = 0;
846 return 0;
847 }
848 cb->remote = xstrdup(refname);
849 return 0;
850}
851
852static const char *unique_tracking_name(const char *name)
853{
66dbfd55
GV
854 struct tracking_name_data cb_data = { NULL, NULL, 1 };
855 cb_data.name = name;
70c9ac2f
JH
856 for_each_ref(check_tracking_name, &cb_data);
857 if (cb_data.unique)
858 return cb_data.remote;
859 free(cb_data.remote);
860 return NULL;
861}
4f353658 862
09ebad6f
JN
863static int parse_branchname_arg(int argc, const char **argv,
864 int dwim_new_local_branch_ok,
865 struct branch_info *new,
866 struct tree **source_tree,
867 unsigned char rev[20],
868 const char **new_branch)
869{
870 int argcount = 0;
871 unsigned char branch_rev[20];
872 const char *arg;
873 int has_dash_dash;
874
875 /*
876 * case 1: git checkout <ref> -- [<paths>]
877 *
878 * <ref> must be a valid tree, everything after the '--' must be
879 * a path.
880 *
881 * case 2: git checkout -- [<paths>]
882 *
883 * everything after the '--' must be paths.
884 *
885 * case 3: git checkout <something> [<paths>]
886 *
887 * With no paths, if <something> is a commit, that is to
888 * switch to the branch or detach HEAD at it. As a special case,
889 * if <something> is A...B (missing A or B means HEAD but you can
890 * omit at most one side), and if there is a unique merge base
891 * between A and B, A...B names that merge base.
892 *
893 * With no paths, if <something> is _not_ a commit, no -t nor -b
894 * was given, and there is a tracking branch whose name is
895 * <something> in one and only one remote, then this is a short-hand
c0791f36 896 * to fork local <something> from that remote-tracking branch.
09ebad6f
JN
897 *
898 * Otherwise <something> shall not be ambiguous.
899 * - If it's *only* a reference, treat it like case (1).
900 * - If it's only a path, treat it like case (2).
901 * - else: fail.
902 *
903 */
904 if (!argc)
905 return 0;
906
907 if (!strcmp(argv[0], "--")) /* case (2) */
908 return 1;
909
910 arg = argv[0];
911 has_dash_dash = (argc > 1) && !strcmp(argv[1], "--");
912
913 if (!strcmp(arg, "-"))
914 arg = "@{-1}";
915
916 if (get_sha1_mb(arg, rev)) {
917 if (has_dash_dash) /* case (1) */
6c80cd29 918 die(_("invalid reference: %s"), arg);
09ebad6f
JN
919 if (dwim_new_local_branch_ok &&
920 !check_filename(NULL, arg) &&
921 argc == 1) {
922 const char *remote = unique_tracking_name(arg);
923 if (!remote || get_sha1(remote, rev))
924 return argcount;
925 *new_branch = arg;
926 arg = remote;
927 /* DWIMmed to create local branch */
928 } else {
929 return argcount;
930 }
931 }
932
933 /* we can't end up being in (2) anymore, eat the argument */
934 argcount++;
935 argv++;
936 argc--;
937
938 new->name = arg;
939 setup_branch_path(new);
940
8d9c5010 941 if (!check_refname_format(new->path, 0) &&
c6893323 942 !read_ref(new->path, branch_rev))
09ebad6f
JN
943 hashcpy(rev, branch_rev);
944 else
945 new->path = NULL; /* not an existing branch */
946
947 new->commit = lookup_commit_reference_gently(rev, 1);
948 if (!new->commit) {
949 /* not a commit */
950 *source_tree = parse_tree_indirect(rev);
951 } else {
952 parse_commit(new->commit);
953 *source_tree = new->commit->tree;
954 }
955
956 if (!*source_tree) /* case (1): want a tree */
6c80cd29 957 die(_("reference is not a tree: %s"), arg);
09ebad6f
JN
958 if (!has_dash_dash) {/* case (3 -> 1) */
959 /*
960 * Do not complain the most common case
961 * git checkout branch
962 * even if there happen to be a file called 'branch';
963 * it would be extremely annoying.
964 */
965 if (argc)
966 verify_non_filename(NULL, arg);
967 } else {
968 argcount++;
969 argv++;
970 argc--;
971 }
972
973 return argcount;
974}
975
a2b4994c 976static int switch_unborn_to_new_branch(const struct checkout_opts *opts)
abe19980
JH
977{
978 int status;
979 struct strbuf branch_ref = STRBUF_INIT;
980
8ced1aa0
CW
981 if (!opts->new_branch)
982 die(_("You are on a branch yet to be born"));
abe19980
JH
983 strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch);
984 status = create_symref("HEAD", branch_ref.buf, "checkout -b");
985 strbuf_release(&branch_ref);
afa8c07a
JK
986 if (!opts->quiet)
987 fprintf(stderr, _("Switched to a new branch '%s'\n"),
988 opts->new_branch);
abe19980
JH
989 return status;
990}
991
b6312c27
NTND
992static int checkout_branch(struct checkout_opts *opts,
993 struct branch_info *new)
994{
995 if (opts->pathspec)
996 die(_("paths cannot be used with switching branches"));
997
998 if (opts->patch_mode)
999 die(_("'%s' cannot be used with switching branches"),
1000 "--patch");
1001
1002 if (opts->writeout_stage)
1003 die(_("'%s' cannot be used with switching branches"),
1004 "--ours/--theirs");
1005
1006 if (opts->force && opts->merge)
1007 die(_("'%s' cannot be used with '%s'"), "-f", "-m");
1008
1009 if (opts->force_detach && opts->new_branch)
1010 die(_("'%s' cannot be used with '%s'"),
1011 "--detach", "-b/-B/--orphan");
1012
1013 if (opts->new_orphan_branch) {
1014 if (opts->track != BRANCH_TRACK_UNSPECIFIED)
1015 die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
1016 } else if (opts->force_detach) {
1017 if (opts->track != BRANCH_TRACK_UNSPECIFIED)
1018 die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
1019 } else if (opts->track == BRANCH_TRACK_UNSPECIFIED)
1020 opts->track = git_branch_track;
1021
1022 if (new->name && !new->commit)
1023 die(_("Cannot switch branch to a non-commit '%s'"),
1024 new->name);
1025
1026 if (!new->commit && opts->new_branch) {
1027 unsigned char rev[20];
1028 int flag;
1029
1030 if (!read_ref_full("HEAD", rev, 0, &flag) &&
1031 (flag & REF_ISSYMREF) && is_null_sha1(rev))
1032 return switch_unborn_to_new_branch(opts);
1033 }
1034 return switch_branches(opts, new);
1035}
1036
782c2d65
DB
1037int cmd_checkout(int argc, const char **argv, const char *prefix)
1038{
1039 struct checkout_opts opts;
782c2d65 1040 struct branch_info new;
eac5a401 1041 char *conflict_style = NULL;
46148dd7 1042 int dwim_new_local_branch = 1;
782c2d65 1043 struct option options[] = {
e05a1093
NTND
1044 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
1045 OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
1046 N_("create and checkout a new branch")),
1047 OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
1048 N_("create/reset and checkout a branch")),
1049 OPT_BOOLEAN('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
1050 OPT_BOOLEAN(0, "detach", &opts.force_detach, N_("detach the HEAD at named commit")),
1051 OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"),
9ed36cfa 1052 BRANCH_TRACK_EXPLICIT),
e05a1093
NTND
1053 OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new branch"), N_("new unparented branch")),
1054 OPT_SET_INT('2', "ours", &opts.writeout_stage, N_("checkout our version for unmerged files"),
38901a48 1055 2),
e05a1093 1056 OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout their version for unmerged files"),
38901a48 1057 3),
e05a1093
NTND
1058 OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)")),
1059 OPT_BOOLEAN('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
1060 OPT_BOOLEAN(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")),
1061 OPT_STRING(0, "conflict", &conflict_style, N_("style"),
1062 N_("conflict style (merge or diff3)")),
b58f3a64 1063 OPT_BOOLEAN('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
08d595dc
NTND
1064 OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree,
1065 N_("do not limit pathspecs to sparse entries only")),
46148dd7 1066 { OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL,
e05a1093 1067 N_("second guess 'git checkout no-such-branch'"),
46148dd7 1068 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
b249b552 1069 OPT_END(),
782c2d65
DB
1070 };
1071
1072 memset(&opts, 0, sizeof(opts));
1073 memset(&new, 0, sizeof(new));
c1d7036b 1074 opts.overwrite_ignore = 1;
e51e3057 1075 opts.prefix = prefix;
782c2d65 1076
23b4c7bc 1077 gitmodules_config();
175f6e59 1078 git_config(git_checkout_config, &opts);
782c2d65 1079
9188ed89 1080 opts.track = BRANCH_TRACK_UNSPECIFIED;
782c2d65 1081
37782920 1082 argc = parse_options(argc, argv, prefix, options, checkout_usage,
f5242ebf 1083 PARSE_OPT_KEEP_DASHDASH);
859fdaba 1084
b6312c27
NTND
1085 if (conflict_style) {
1086 opts.merge = 1; /* implied */
1087 git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
1088 }
02ac9837 1089
b6312c27
NTND
1090 if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)
1091 die(_("-b, -B and --orphan are mutually exclusive"));
02ac9837 1092
b6312c27
NTND
1093 /*
1094 * From here on, new_branch will contain the branch to be checked out,
1095 * and new_branch_force and new_orphan_branch will tell us which one of
1096 * -b/-B/--orphan is being used.
1097 */
02ac9837
TRC
1098 if (opts.new_branch_force)
1099 opts.new_branch = opts.new_branch_force;
1100
b6312c27
NTND
1101 if (opts.new_orphan_branch)
1102 opts.new_branch = opts.new_orphan_branch;
32669671 1103
b6312c27
NTND
1104 /* --track without -b/-B/--orphan should DWIM */
1105 if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {
9188ed89
AR
1106 const char *argv0 = argv[0];
1107 if (!argc || !strcmp(argv0, "--"))
e8a8a4d7 1108 die (_("--track needs a branch name"));
9188ed89
AR
1109 if (!prefixcmp(argv0, "refs/"))
1110 argv0 += 5;
1111 if (!prefixcmp(argv0, "remotes/"))
1112 argv0 += 8;
1113 argv0 = strchr(argv0, '/');
1114 if (!argv0 || !argv0[1])
e8a8a4d7 1115 die (_("Missing branch name; try -b"));
9188ed89 1116 opts.new_branch = argv0 + 1;
bb0ceb62
JS
1117 }
1118
859fdaba 1119 /*
09ebad6f
JN
1120 * Extract branch name from command line arguments, so
1121 * all that is left is pathspecs.
859fdaba 1122 *
09ebad6f 1123 * Handle
70c9ac2f 1124 *
09ebad6f
JN
1125 * 1) git checkout <tree> -- [<paths>]
1126 * 2) git checkout -- [<paths>]
1127 * 3) git checkout <something> [<paths>]
859fdaba 1128 *
09ebad6f
JN
1129 * including "last branch" syntax and DWIM-ery for names of
1130 * remote branches, erroring out for invalid or ambiguous cases.
859fdaba 1131 */
782c2d65 1132 if (argc) {
e51e3057 1133 unsigned char rev[20];
09ebad6f 1134 int dwim_ok =
e51e3057 1135 !opts.patch_mode &&
09ebad6f
JN
1136 dwim_new_local_branch &&
1137 opts.track == BRANCH_TRACK_UNSPECIFIED &&
1138 !opts.new_branch;
f8bd36a4 1139 int n = parse_branchname_arg(argc, argv, dwim_ok,
e51e3057
NTND
1140 &new, &opts.source_tree,
1141 rev, &opts.new_branch);
09ebad6f
JN
1142 argv += n;
1143 argc -= n;
782c2d65
DB
1144 }
1145
782c2d65 1146 if (argc) {
e51e3057 1147 opts.pathspec = get_pathspec(prefix, argv);
301e42ed 1148
e51e3057 1149 if (!opts.pathspec)
e8a8a4d7 1150 die(_("invalid path specification"));
301e42ed 1151
b6312c27
NTND
1152 /*
1153 * Try to give more helpful suggestion.
1154 * new_branch && argc > 1 will be caught later.
1155 */
1156 if (opts.new_branch && argc == 1)
1157 die(_("Cannot update paths and switch to branch '%s' at the same time.\n"
1158 "Did you intend to checkout '%s' which can not be resolved as commit?"),
1159 opts.new_branch, argv[0]);
782c2d65 1160
32669671 1161 if (opts.force_detach)
b6312c27
NTND
1162 die(_("git checkout: --detach does not take a path argument '%s'"),
1163 argv[0]);
32669671 1164
0cf8581e 1165 if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
b6312c27
NTND
1166 die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1167 "checking out of the index."));
782c2d65
DB
1168 }
1169
352eadc4 1170 if (opts.new_branch) {
f285a2d7 1171 struct strbuf buf = STRBUF_INIT;
55c4a673 1172
b6312c27
NTND
1173 opts.branch_exists =
1174 validate_new_branchname(opts.new_branch, &buf,
1175 !!opts.new_branch_force,
1176 !!opts.new_branch_force);
55c4a673 1177
352eadc4
DB
1178 strbuf_release(&buf);
1179 }
1180
b6312c27
NTND
1181 if (opts.patch_mode || opts.pathspec)
1182 return checkout_paths(&opts, new.name);
1183 else
1184 return checkout_branch(&opts, &new);
782c2d65 1185}