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