Convert read_mmblob to take struct object_id.
[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",
f2fd0760 59 sha1_to_hex(old ? old->object.oid.hash : null_sha1),
60 sha1_to_hex(new ? new->object.oid.hash : null_sha1),
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
38901a48
JH
157static int checkout_stage(int stage, struct cache_entry *ce, int pos,
158 struct checkout *state)
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
0cf8581e
JH
172static int checkout_merged(int pos, struct checkout *state)
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;
242 struct checkout state;
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
03b86647 277 hold_locked_index(lock_file, 1);
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 memset(&state, 0, sizeof(state));
356 state.force = 1;
357 state.refresh_cache = 1;
d4a2024a 358 state.istate = &the_index;
782c2d65
DB
359 for (pos = 0; pos < active_nr; pos++) {
360 struct cache_entry *ce = active_cache[pos];
e721c154 361 if (ce->ce_flags & CE_MATCHED) {
8fdcf312
JH
362 if (!ce_stage(ce)) {
363 errs |= checkout_entry(ce, &state, NULL);
364 continue;
365 }
f9022075
SB
366 if (opts->writeout_stage)
367 errs |= checkout_stage(opts->writeout_stage, ce, pos, &state);
368 else if (opts->merge)
0cf8581e 369 errs |= checkout_merged(pos, &state);
8fdcf312 370 pos = skip_same_name(ce, pos) - 1;
782c2d65
DB
371 }
372 }
373
03b86647 374 if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
e8a8a4d7 375 die(_("unable to write new index file"));
75336878 376
60af7691 377 read_ref_full("HEAD", 0, rev.hash, NULL);
378 head = lookup_commit_reference_gently(rev.hash, 1);
782c2d65 379
d2b3691b
JH
380 errs |= post_checkout_hook(head, head, 0);
381 return errs;
782c2d65
DB
382}
383
a2b4994c
NTND
384static void show_local_changes(struct object *head,
385 const struct diff_options *opts)
782c2d65
DB
386{
387 struct rev_info rev;
388 /* I think we want full paths, even if we're in a subdirectory. */
389 init_revisions(&rev, NULL);
175f6e59 390 rev.diffopt.flags = opts->flags;
782c2d65 391 rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
28452655 392 diff_setup_done(&rev.diffopt);
782c2d65
DB
393 add_pending_object(&rev, head, NULL);
394 run_diff_index(&rev, 0);
395}
396
b3c0494a 397static void describe_detached_head(const char *msg, struct commit *commit)
782c2d65 398{
f285a2d7 399 struct strbuf sb = STRBUF_INIT;
3c621839
JK
400 if (!parse_commit(commit))
401 pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
782c2d65 402 fprintf(stderr, "%s %s... %s\n", msg,
ed1c9977 403 find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
782c2d65
DB
404 strbuf_release(&sb);
405}
406
a2b4994c
NTND
407static int reset_tree(struct tree *tree, const struct checkout_opts *o,
408 int worktree, int *writeout_error)
782c2d65
DB
409{
410 struct unpack_trees_options opts;
411 struct tree_desc tree_desc;
bc052d7f 412
782c2d65
DB
413 memset(&opts, 0, sizeof(opts));
414 opts.head_idx = -1;
6286a08d
JH
415 opts.update = worktree;
416 opts.skip_unmerged = !worktree;
782c2d65
DB
417 opts.reset = 1;
418 opts.merge = 1;
419 opts.fn = oneway_merge;
870ebdb9 420 opts.verbose_update = o->show_progress;
34110cd4
LT
421 opts.src_index = &the_index;
422 opts.dst_index = &the_index;
782c2d65
DB
423 parse_tree(tree);
424 init_tree_desc(&tree_desc, tree->buffer, tree->size);
291d823e
JH
425 switch (unpack_trees(1, &tree_desc, &opts)) {
426 case -2:
a2b4994c 427 *writeout_error = 1;
291d823e
JH
428 /*
429 * We return 0 nevertheless, as the index is all right
430 * and more importantly we have made best efforts to
431 * update paths in the work tree, and we cannot revert
432 * them.
433 */
434 case 0:
435 return 0;
436 default:
84a5750b 437 return 128;
291d823e 438 }
782c2d65
DB
439}
440
782c2d65
DB
441struct branch_info {
442 const char *name; /* The short name used */
443 const char *path; /* The full name of a real branch */
444 struct commit *commit; /* The named commit */
5883034c
NTND
445 /*
446 * if not null the branch is detached because it's already
447 * checked out in this checkout
448 */
449 char *checkout;
782c2d65
DB
450};
451
452static void setup_branch_path(struct branch_info *branch)
453{
f285a2d7 454 struct strbuf buf = STRBUF_INIT;
ae5a6c36 455
a552de75
JH
456 strbuf_branchname(&buf, branch->name);
457 if (strcmp(buf.buf, branch->name))
ae5a6c36 458 branch->name = xstrdup(buf.buf);
a552de75 459 strbuf_splice(&buf, 0, 0, "refs/heads/", 11);
782c2d65
DB
460 branch->path = strbuf_detach(&buf, NULL);
461}
462
a2b4994c
NTND
463static int merge_working_tree(const struct checkout_opts *opts,
464 struct branch_info *old,
465 struct branch_info *new,
466 int *writeout_error)
782c2d65
DB
467{
468 int ret;
469 struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
b96524f8 470
03b86647 471 hold_locked_index(lock_file, 1);
53996fe5 472 if (read_cache_preload(NULL) < 0)
e923a8ab 473 return error(_("index file corrupt"));
782c2d65 474
cfc5789a 475 resolve_undo_clear();
782c2d65 476 if (opts->force) {
a2b4994c 477 ret = reset_tree(new->commit->tree, opts, 1, writeout_error);
782c2d65
DB
478 if (ret)
479 return ret;
480 } else {
481 struct tree_desc trees[2];
482 struct tree *tree;
483 struct unpack_trees_options topts;
bc052d7f 484
782c2d65
DB
485 memset(&topts, 0, sizeof(topts));
486 topts.head_idx = -1;
34110cd4
LT
487 topts.src_index = &the_index;
488 topts.dst_index = &the_index;
782c2d65 489
e294030f 490 setup_unpack_trees_porcelain(&topts, "checkout");
8ccba008 491
782c2d65
DB
492 refresh_cache(REFRESH_QUIET);
493
494 if (unmerged_cache()) {
e8a8a4d7 495 error(_("you need to resolve your current index first"));
04c9e11f 496 return 1;
782c2d65 497 }
04c9e11f
JH
498
499 /* 2-way merge to the new branch */
fa7b3c2f 500 topts.initial_checkout = is_cache_unborn();
04c9e11f
JH
501 topts.update = 1;
502 topts.merge = 1;
64da3ae5 503 topts.gently = opts->merge && old->commit;
870ebdb9 504 topts.verbose_update = opts->show_progress;
04c9e11f 505 topts.fn = twoway_merge;
c1d7036b
NTND
506 if (opts->overwrite_ignore) {
507 topts.dir = xcalloc(1, sizeof(*topts.dir));
508 topts.dir->flags |= DIR_SHOW_IGNORED;
509 setup_standard_excludes(topts.dir);
510 }
272be14a 511 tree = parse_tree_indirect(old->commit ?
ed1c9977 512 old->commit->object.oid.hash :
dab0d410 513 EMPTY_TREE_SHA1_BIN);
04c9e11f 514 init_tree_desc(&trees[0], tree->buffer, tree->size);
f2fd0760 515 tree = parse_tree_indirect(new->commit->object.oid.hash);
04c9e11f
JH
516 init_tree_desc(&trees[1], tree->buffer, tree->size);
517
291d823e 518 ret = unpack_trees(2, trees, &topts);
49d833dc 519 if (ret == -1) {
782c2d65
DB
520 /*
521 * Unpack couldn't do a trivial merge; either
522 * give up or do a real merge, depending on
523 * whether the merge flag was used.
524 */
525 struct tree *result;
526 struct tree *work;
8a2fce18 527 struct merge_options o;
782c2d65
DB
528 if (!opts->merge)
529 return 1;
64da3ae5
JH
530
531 /*
532 * Without old->commit, the below is the same as
533 * the two-tree unpack we already tried and failed.
534 */
535 if (!old->commit)
536 return 1;
782c2d65
DB
537
538 /* Do more real merge */
539
540 /*
541 * We update the index fully, then write the
542 * tree from the index, then merge the new
543 * branch with the current tree, with the old
544 * branch as the base. Then we reset the index
545 * (but not the working tree) to the new
546 * branch, leaving the working tree as the
547 * merged version, but skipping unmerged
548 * entries in the index.
549 */
550
4e55ed32 551 add_files_to_cache(NULL, NULL, 0, 0);
7610fa57
JN
552 /*
553 * NEEDSWORK: carrying over local changes
554 * when branches have different end-of-line
555 * normalization (or clean+smudge rules) is
556 * a pain; plumb in an option to set
557 * o.renormalize?
558 */
8a2fce18
MV
559 init_merge_options(&o);
560 o.verbosity = 0;
561 work = write_tree_from_memory(&o);
782c2d65 562
a2b4994c
NTND
563 ret = reset_tree(new->commit->tree, opts, 1,
564 writeout_error);
782c2d65
DB
565 if (ret)
566 return ret;
c4151629 567 o.ancestor = old->name;
8a2fce18
MV
568 o.branch1 = new->name;
569 o.branch2 = "local";
f241ff0d 570 ret = merge_trees(&o, new->commit->tree, work,
8a2fce18 571 old->commit->tree, &result);
f241ff0d
JS
572 if (ret < 0)
573 exit(128);
a2b4994c
NTND
574 ret = reset_tree(new->commit->tree, opts, 0,
575 writeout_error);
548009c0 576 strbuf_release(&o.obuf);
84a5750b
JH
577 if (ret)
578 return ret;
782c2d65
DB
579 }
580 }
581
aecf567c
DT
582 if (!active_cache_tree)
583 active_cache_tree = cache_tree();
584
585 if (!cache_tree_fully_valid(active_cache_tree))
3fd13cbc 586 cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
aecf567c 587
03b86647 588 if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
e8a8a4d7 589 die(_("unable to write new index file"));
782c2d65 590
7fe4a728 591 if (!opts->force && !opts->quiet)
175f6e59 592 show_local_changes(&new->commit->object, &opts->diff_options);
782c2d65
DB
593
594 return 0;
595}
596
6d21bf96 597static void report_tracking(struct branch_info *new)
79a1e6b4 598{
6d21bf96 599 struct strbuf sb = STRBUF_INIT;
b56fca07 600 struct branch *branch = branch_get(new->name);
79a1e6b4 601
6d21bf96 602 if (!format_tracking_info(branch, &sb))
79a1e6b4 603 return;
6d21bf96
JH
604 fputs(sb.buf, stdout);
605 strbuf_release(&sb);
b0030db3 606}
79a1e6b4 607
a2b4994c 608static void update_refs_for_switch(const struct checkout_opts *opts,
782c2d65
DB
609 struct branch_info *old,
610 struct branch_info *new)
611{
f285a2d7 612 struct strbuf msg = STRBUF_INIT;
3bed291a 613 const char *old_desc, *reflog_msg;
782c2d65 614 if (opts->new_branch) {
3631bf77
EM
615 if (opts->new_orphan_branch) {
616 if (opts->new_branch_log && !log_all_ref_updates) {
1a83c240 617 int ret;
abd0cd3a 618 char *refname;
a4c653df 619 struct strbuf err = STRBUF_INIT;
3631bf77 620
abd0cd3a
DT
621 refname = mkpathdup("refs/heads/%s", opts->new_orphan_branch);
622 ret = safe_create_reflog(refname, 1, &err);
623 free(refname);
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);
3631bf77
EM
628 return;
629 }
abd0cd3a 630 strbuf_release(&err);
3631bf77
EM
631 }
632 }
633 else
02ac9837
TRC
634 create_branch(old->name, opts->new_branch, new->name,
635 opts->new_branch_force ? 1 : 0,
39bd6f72
JN
636 opts->new_branch_log,
637 opts->new_branch_force ? 1 : 0,
f9a482e6 638 opts->quiet,
39bd6f72 639 opts->track);
782c2d65
DB
640 new->name = opts->new_branch;
641 setup_branch_path(new);
642 }
643
782c2d65 644 old_desc = old->name;
323e00fd 645 if (!old_desc && old->commit)
f2fd0760 646 old_desc = oid_to_hex(&old->commit->object.oid);
3bed291a
RR
647
648 reflog_msg = getenv("GIT_REFLOG_ACTION");
649 if (!reflog_msg)
650 strbuf_addf(&msg, "checkout: moving from %s to %s",
651 old_desc ? old_desc : "(invalid)", new->name);
652 else
653 strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg));
782c2d65 654
f8bd36a4
JN
655 if (!strcmp(new->name, "HEAD") && !new->path && !opts->force_detach) {
656 /* Nothing to do. */
657 } else if (opts->force_detach || !new->path) { /* No longer on any branch. */
ed1c9977 658 update_ref(msg.buf, "HEAD", new->commit->object.oid.hash, NULL,
f4124112 659 REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
f8bd36a4 660 if (!opts->quiet) {
779b88a9
SB
661 if (old->path &&
662 advice_detached_head && !opts->force_detach)
2857093b 663 detach_advice(new->name);
6c80cd29 664 describe_detached_head(_("HEAD is now at"), new->commit);
f8bd36a4
JN
665 }
666 } else if (new->path) { /* Switch branches. */
4be49d75 667 if (create_symref("HEAD", new->path, msg.buf) < 0)
4636f651 668 die(_("unable to update HEAD"));
782c2d65 669 if (!opts->quiet) {
08eaa4be 670 if (old->path && !strcmp(new->path, old->path)) {
39bd6f72
JN
671 if (opts->new_branch_force)
672 fprintf(stderr, _("Reset branch '%s'\n"),
673 new->name);
674 else
675 fprintf(stderr, _("Already on '%s'\n"),
676 new->name);
08eaa4be
ÆAB
677 } else if (opts->new_branch) {
678 if (opts->branch_exists)
679 fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
680 else
681 fprintf(stderr, _("Switched to a new branch '%s'\n"), new->name);
682 } else {
e8a8a4d7 683 fprintf(stderr, _("Switched to branch '%s'\n"),
09a0ec58 684 new->name);
08eaa4be 685 }
782c2d65 686 }
3631bf77 687 if (old->path && old->name) {
482b8f32 688 if (!ref_exists(old->path) && reflog_exists(old->path))
4da58835 689 delete_reflog(old->path);
3631bf77 690 }
782c2d65
DB
691 }
692 remove_branch_state();
693 strbuf_release(&msg);
32669671
JH
694 if (!opts->quiet &&
695 (new->path || (!opts->force_detach && !strcmp(new->name, "HEAD"))))
6d21bf96 696 report_tracking(new);
782c2d65
DB
697}
698
468224e5 699static int add_pending_uninteresting_ref(const char *refname,
fcb615f5 700 const struct object_id *oid,
468224e5 701 int flags, void *cb_data)
8e2dc6ac 702{
fcb615f5 703 add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);
5c08dc48
JK
704 return 0;
705}
8e2dc6ac
JH
706
707static void describe_one_orphan(struct strbuf *sb, struct commit *commit)
708{
0be240cc 709 strbuf_addstr(sb, " ");
1eb47f16 710 strbuf_add_unique_abbrev(sb, commit->object.oid.hash, DEFAULT_ABBREV);
0be240cc 711 strbuf_addch(sb, ' ');
3c621839
JK
712 if (!parse_commit(commit))
713 pp_commit_easy(CMIT_FMT_ONELINE, commit, sb);
8e2dc6ac
JH
714 strbuf_addch(sb, '\n');
715}
716
717#define ORPHAN_CUTOFF 4
718static void suggest_reattach(struct commit *commit, struct rev_info *revs)
719{
720 struct commit *c, *last = NULL;
721 struct strbuf sb = STRBUF_INIT;
722 int lost = 0;
723 while ((c = get_revision(revs)) != NULL) {
724 if (lost < ORPHAN_CUTOFF)
725 describe_one_orphan(&sb, c);
726 last = c;
727 lost++;
728 }
729 if (ORPHAN_CUTOFF < lost) {
730 int more = lost - ORPHAN_CUTOFF;
731 if (more == 1)
732 describe_one_orphan(&sb, last);
733 else
f06f08b7 734 strbuf_addf(&sb, _(" ... and %d more.\n"), more);
8e2dc6ac
JH
735 }
736
737 fprintf(stderr,
f06f08b7
ÆAB
738 Q_(
739 /* The singular version */
740 "Warning: you are leaving %d commit behind, "
741 "not connected to\n"
742 "any of your branches:\n\n"
0faf2474 743 "%s\n",
f06f08b7
ÆAB
744 /* The plural version */
745 "Warning: you are leaving %d commits behind, "
8e2dc6ac
JH
746 "not connected to\n"
747 "any of your branches:\n\n"
f807b3dc 748 "%s\n",
f06f08b7
ÆAB
749 /* Give ngettext() the count */
750 lost),
751 lost,
f807b3dc 752 sb.buf);
8e2dc6ac 753 strbuf_release(&sb);
f807b3dc
JH
754
755 if (advice_detached_head)
756 fprintf(stderr,
fc792ca8
TS
757 Q_(
758 /* The singular version */
759 "If you want to keep it by creating a new branch, "
760 "this may be a good time\nto do so with:\n\n"
761 " git branch <new-branch-name> %s\n\n",
762 /* The plural version */
f807b3dc
JH
763 "If you want to keep them by creating a new branch, "
764 "this may be a good time\nto do so with:\n\n"
fc792ca8
TS
765 " git branch <new-branch-name> %s\n\n",
766 /* Give ngettext() the count */
767 lost),
ed1c9977 768 find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
8e2dc6ac
JH
769}
770
771/*
772 * We are about to leave commit that was at the tip of a detached
773 * HEAD. If it is not reachable from any ref, this is the last chance
774 * for the user to do so without resorting to reflog.
775 */
5d886395 776static void orphaned_commit_warning(struct commit *old, struct commit *new)
8e2dc6ac 777{
8e2dc6ac 778 struct rev_info revs;
5d886395 779 struct object *object = &old->object;
10621419 780 struct object_array refs;
8e2dc6ac
JH
781
782 init_revisions(&revs, NULL);
468224e5
RS
783 setup_revisions(0, NULL, &revs, NULL);
784
785 object->flags &= ~UNINTERESTING;
f2fd0760 786 add_pending_object(&revs, object, oid_to_hex(&object->oid));
468224e5 787
fcb615f5 788 for_each_ref(add_pending_uninteresting_ref, &revs);
f2fd0760 789 add_pending_sha1(&revs, "HEAD", new->object.oid.hash, UNINTERESTING);
468224e5 790
10621419
RS
791 refs = revs.pending;
792 revs.leak_pending = 1;
793
8e2dc6ac 794 if (prepare_revision_walk(&revs))
6c80cd29 795 die(_("internal error in revision walk"));
5d886395
JS
796 if (!(old->object.flags & UNINTERESTING))
797 suggest_reattach(old, &revs);
8e2dc6ac 798 else
5d886395 799 describe_detached_head(_("Previous HEAD position was"), old);
5c08dc48 800
86a0a408 801 clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
10621419 802 free(refs.objects);
8e2dc6ac
JH
803}
804
e51e3057
NTND
805static int switch_branches(const struct checkout_opts *opts,
806 struct branch_info *new)
782c2d65
DB
807{
808 int ret = 0;
809 struct branch_info old;
96ec7b1e 810 void *path_to_free;
60af7691 811 struct object_id rev;
a2b4994c 812 int flag, writeout_error = 0;
782c2d65 813 memset(&old, 0, sizeof(old));
60af7691 814 old.path = path_to_free = resolve_refdup("HEAD", 0, rev.hash, &flag);
815 old.commit = lookup_commit_reference_gently(rev.hash, 1);
96ec7b1e 816 if (!(flag & REF_ISSYMREF))
782c2d65
DB
817 old.path = NULL;
818
95b567c7
JK
819 if (old.path)
820 skip_prefix(old.path, "refs/heads/", &old.name);
782c2d65
DB
821
822 if (!new->name) {
823 new->name = "HEAD";
824 new->commit = old.commit;
825 if (!new->commit)
e8a8a4d7 826 die(_("You are on a branch yet to be born"));
683ff884 827 parse_commit_or_die(new->commit);
782c2d65
DB
828 }
829
a2b4994c 830 ret = merge_working_tree(opts, &old, new, &writeout_error);
96ec7b1e
NTND
831 if (ret) {
832 free(path_to_free);
782c2d65 833 return ret;
96ec7b1e 834 }
782c2d65 835
272be14a 836 if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
5d886395 837 orphaned_commit_warning(old.commit, new->commit);
77ebd56d 838
782c2d65
DB
839 update_refs_for_switch(opts, &old, new);
840
291d823e 841 ret = post_checkout_hook(old.commit, new->commit, 1);
96ec7b1e 842 free(path_to_free);
a2b4994c 843 return ret || writeout_error;
782c2d65
DB
844}
845
0cf8581e
JH
846static int git_checkout_config(const char *var, const char *value, void *cb)
847{
175f6e59
JS
848 if (!strcmp(var, "diff.ignoresubmodules")) {
849 struct checkout_opts *opts = cb;
850 handle_ignore_submodules_arg(&opts->diff_options, value);
851 return 0;
852 }
23b4c7bc 853
59556548 854 if (starts_with(var, "submodule."))
23b4c7bc
JL
855 return parse_submodule_config_option(var, value);
856
175f6e59 857 return git_xmerge_config(var, value, NULL);
0cf8581e
JH
858}
859
70c9ac2f 860struct tracking_name_data {
fa83a33b
JH
861 /* const */ char *src_ref;
862 char *dst_ref;
60af7691 863 struct object_id *dst_oid;
70c9ac2f
JH
864 int unique;
865};
866
fa83a33b 867static int check_tracking_name(struct remote *remote, void *cb_data)
70c9ac2f
JH
868{
869 struct tracking_name_data *cb = cb_data;
fa83a33b
JH
870 struct refspec query;
871 memset(&query, 0, sizeof(struct refspec));
872 query.src = cb->src_ref;
873 if (remote_find_tracking(remote, &query) ||
60af7691 874 get_oid(query.dst, cb->dst_oid)) {
2c484202 875 free(query.dst);
70c9ac2f 876 return 0;
2c484202 877 }
fa83a33b 878 if (cb->dst_ref) {
2c484202 879 free(query.dst);
70c9ac2f
JH
880 cb->unique = 0;
881 return 0;
882 }
2c484202 883 cb->dst_ref = query.dst;
70c9ac2f
JH
884 return 0;
885}
886
60af7691 887static const char *unique_tracking_name(const char *name, struct object_id *oid)
70c9ac2f 888{
fa83a33b
JH
889 struct tracking_name_data cb_data = { NULL, NULL, NULL, 1 };
890 char src_ref[PATH_MAX];
891 snprintf(src_ref, PATH_MAX, "refs/heads/%s", name);
892 cb_data.src_ref = src_ref;
60af7691 893 cb_data.dst_oid = oid;
fa83a33b 894 for_each_remote(check_tracking_name, &cb_data);
70c9ac2f 895 if (cb_data.unique)
fa83a33b
JH
896 return cb_data.dst_ref;
897 free(cb_data.dst_ref);
70c9ac2f
JH
898 return NULL;
899}
4f353658 900
09ebad6f
JN
901static int parse_branchname_arg(int argc, const char **argv,
902 int dwim_new_local_branch_ok,
903 struct branch_info *new,
10f102be 904 struct checkout_opts *opts,
60af7691 905 struct object_id *rev)
09ebad6f 906{
10f102be
NTND
907 struct tree **source_tree = &opts->source_tree;
908 const char **new_branch = &opts->new_branch;
09ebad6f 909 int argcount = 0;
60af7691 910 struct object_id branch_rev;
09ebad6f 911 const char *arg;
bca39695
MM
912 int dash_dash_pos;
913 int has_dash_dash = 0;
914 int i;
09ebad6f
JN
915
916 /*
917 * case 1: git checkout <ref> -- [<paths>]
918 *
919 * <ref> must be a valid tree, everything after the '--' must be
920 * a path.
921 *
922 * case 2: git checkout -- [<paths>]
923 *
924 * everything after the '--' must be paths.
925 *
a047fafc 926 * case 3: git checkout <something> [--]
09ebad6f 927 *
a047fafc
MM
928 * (a) If <something> is a commit, that is to
929 * switch to the branch or detach HEAD at it. As a special case,
930 * if <something> is A...B (missing A or B means HEAD but you can
931 * omit at most one side), and if there is a unique merge base
932 * between A and B, A...B names that merge base.
09ebad6f 933 *
a047fafc 934 * (b) If <something> is _not_ a commit, either "--" is present
01689909 935 * or <something> is not a path, no -t or -b was given, and
a047fafc
MM
936 * and there is a tracking branch whose name is <something>
937 * in one and only one remote, then this is a short-hand to
938 * fork local <something> from that remote-tracking branch.
09ebad6f 939 *
a047fafc
MM
940 * (c) Otherwise, if "--" is present, treat it like case (1).
941 *
942 * (d) Otherwise :
943 * - if it's a reference, treat it like case (1)
944 * - else if it's a path, treat it like case (2)
945 * - else: fail.
946 *
947 * case 4: git checkout <something> <paths>
948 *
949 * The first argument must not be ambiguous.
09ebad6f
JN
950 * - If it's *only* a reference, treat it like case (1).
951 * - If it's only a path, treat it like case (2).
952 * - else: fail.
953 *
954 */
955 if (!argc)
956 return 0;
957
09ebad6f 958 arg = argv[0];
bca39695
MM
959 dash_dash_pos = -1;
960 for (i = 0; i < argc; i++) {
961 if (!strcmp(argv[i], "--")) {
962 dash_dash_pos = i;
963 break;
964 }
965 }
966 if (dash_dash_pos == 0)
967 return 1; /* case (2) */
968 else if (dash_dash_pos == 1)
969 has_dash_dash = 1; /* case (3) or (1) */
970 else if (dash_dash_pos >= 2)
971 die(_("only one reference expected, %d given."), dash_dash_pos);
09ebad6f
JN
972
973 if (!strcmp(arg, "-"))
974 arg = "@{-1}";
975
60af7691 976 if (get_sha1_mb(arg, rev->hash)) {
a047fafc
MM
977 /*
978 * Either case (3) or (4), with <something> not being
979 * a commit, or an attempt to use case (1) with an
980 * invalid ref.
981 *
982 * It's likely an error, but we need to find out if
983 * we should auto-create the branch, case (3).(b).
984 */
985 int recover_with_dwim = dwim_new_local_branch_ok;
986
df714f81
JK
987 if (!has_dash_dash &&
988 (check_filename(NULL, arg) || !no_wildcard(arg)))
a047fafc
MM
989 recover_with_dwim = 0;
990 /*
991 * Accept "git checkout foo" and "git checkout foo --"
992 * as candidates for dwim.
993 */
994 if (!(argc == 1 && !has_dash_dash) &&
995 !(argc == 2 && has_dash_dash))
996 recover_with_dwim = 0;
997
998 if (recover_with_dwim) {
fa83a33b 999 const char *remote = unique_tracking_name(arg, rev);
a047fafc
MM
1000 if (remote) {
1001 *new_branch = arg;
1002 arg = remote;
1003 /* DWIMmed to create local branch, case (3).(b) */
1004 } else {
1005 recover_with_dwim = 0;
1006 }
1007 }
1008
1009 if (!recover_with_dwim) {
1010 if (has_dash_dash)
1011 die(_("invalid reference: %s"), arg);
09ebad6f
JN
1012 return argcount;
1013 }
1014 }
1015
1016 /* we can't end up being in (2) anymore, eat the argument */
1017 argcount++;
1018 argv++;
1019 argc--;
1020
1021 new->name = arg;
1022 setup_branch_path(new);
1023
8d9c5010 1024 if (!check_refname_format(new->path, 0) &&
60af7691 1025 !read_ref(new->path, branch_rev.hash))
1026 oidcpy(rev, &branch_rev);
09ebad6f
JN
1027 else
1028 new->path = NULL; /* not an existing branch */
1029
60af7691 1030 new->commit = lookup_commit_reference_gently(rev->hash, 1);
09ebad6f
JN
1031 if (!new->commit) {
1032 /* not a commit */
60af7691 1033 *source_tree = parse_tree_indirect(rev->hash);
09ebad6f 1034 } else {
683ff884 1035 parse_commit_or_die(new->commit);
09ebad6f
JN
1036 *source_tree = new->commit->tree;
1037 }
1038
1039 if (!*source_tree) /* case (1): want a tree */
6c80cd29 1040 die(_("reference is not a tree: %s"), arg);
a047fafc 1041 if (!has_dash_dash) {/* case (3).(d) -> (1) */
09ebad6f
JN
1042 /*
1043 * Do not complain the most common case
1044 * git checkout branch
1045 * even if there happen to be a file called 'branch';
1046 * it would be extremely annoying.
1047 */
1048 if (argc)
1049 verify_non_filename(NULL, arg);
1050 } else {
1051 argcount++;
1052 argv++;
1053 argc--;
1054 }
1055
1056 return argcount;
1057}
1058
a2b4994c 1059static int switch_unborn_to_new_branch(const struct checkout_opts *opts)
abe19980
JH
1060{
1061 int status;
1062 struct strbuf branch_ref = STRBUF_INIT;
1063
8ced1aa0
CW
1064 if (!opts->new_branch)
1065 die(_("You are on a branch yet to be born"));
abe19980
JH
1066 strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch);
1067 status = create_symref("HEAD", branch_ref.buf, "checkout -b");
1068 strbuf_release(&branch_ref);
afa8c07a
JK
1069 if (!opts->quiet)
1070 fprintf(stderr, _("Switched to a new branch '%s'\n"),
1071 opts->new_branch);
abe19980
JH
1072 return status;
1073}
1074
b6312c27
NTND
1075static int checkout_branch(struct checkout_opts *opts,
1076 struct branch_info *new)
1077{
817b345a 1078 if (opts->pathspec.nr)
b6312c27
NTND
1079 die(_("paths cannot be used with switching branches"));
1080
1081 if (opts->patch_mode)
1082 die(_("'%s' cannot be used with switching branches"),
1083 "--patch");
1084
1085 if (opts->writeout_stage)
1086 die(_("'%s' cannot be used with switching branches"),
1087 "--ours/--theirs");
1088
1089 if (opts->force && opts->merge)
1090 die(_("'%s' cannot be used with '%s'"), "-f", "-m");
1091
1092 if (opts->force_detach && opts->new_branch)
1093 die(_("'%s' cannot be used with '%s'"),
1094 "--detach", "-b/-B/--orphan");
1095
1096 if (opts->new_orphan_branch) {
1097 if (opts->track != BRANCH_TRACK_UNSPECIFIED)
1098 die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
1099 } else if (opts->force_detach) {
1100 if (opts->track != BRANCH_TRACK_UNSPECIFIED)
1101 die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
1102 } else if (opts->track == BRANCH_TRACK_UNSPECIFIED)
1103 opts->track = git_branch_track;
1104
1105 if (new->name && !new->commit)
1106 die(_("Cannot switch branch to a non-commit '%s'"),
1107 new->name);
1108
c265c533
ES
1109 if (new->path && !opts->force_detach && !opts->new_branch &&
1110 !opts->ignore_other_worktrees) {
60af7691 1111 struct object_id oid;
e1c1ab9d 1112 int flag;
60af7691 1113 char *head_ref = resolve_refdup("HEAD", 0, oid.hash, &flag);
e1c1ab9d 1114 if (head_ref &&
c265c533 1115 (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
8d9fdd70 1116 die_if_checked_out(new->path, 1);
e1c1ab9d
NTND
1117 free(head_ref);
1118 }
1119
b6312c27 1120 if (!new->commit && opts->new_branch) {
60af7691 1121 struct object_id rev;
b6312c27
NTND
1122 int flag;
1123
60af7691 1124 if (!read_ref_full("HEAD", 0, rev.hash, &flag) &&
1125 (flag & REF_ISSYMREF) && is_null_oid(&rev))
b6312c27
NTND
1126 return switch_unborn_to_new_branch(opts);
1127 }
1128 return switch_branches(opts, new);
1129}
1130
782c2d65
DB
1131int cmd_checkout(int argc, const char **argv, const char *prefix)
1132{
1133 struct checkout_opts opts;
782c2d65 1134 struct branch_info new;
eac5a401 1135 char *conflict_style = NULL;
46148dd7 1136 int dwim_new_local_branch = 1;
782c2d65 1137 struct option options[] = {
e05a1093
NTND
1138 OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
1139 OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
1140 N_("create and checkout a new branch")),
1141 OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
1142 N_("create/reset and checkout a branch")),
d5d09d47 1143 OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
e923a8ab 1144 OPT_BOOL(0, "detach", &opts.force_detach, N_("detach HEAD at named commit")),
e05a1093 1145 OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"),
9ed36cfa 1146 BRANCH_TRACK_EXPLICIT),
e703d711 1147 OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
e05a1093 1148 OPT_SET_INT('2', "ours", &opts.writeout_stage, N_("checkout our version for unmerged files"),
38901a48 1149 2),
e05a1093 1150 OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout their version for unmerged files"),
38901a48 1151 3),
e05a1093 1152 OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)")),
d5d09d47
SB
1153 OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
1154 OPT_BOOL(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")),
e05a1093
NTND
1155 OPT_STRING(0, "conflict", &conflict_style, N_("style"),
1156 N_("conflict style (merge or diff3)")),
d5d09d47 1157 OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
08d595dc
NTND
1158 OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree,
1159 N_("do not limit pathspecs to sparse entries only")),
4741edd5 1160 OPT_HIDDEN_BOOL(0, "guess", &dwim_new_local_branch,
9c9b4f2f 1161 N_("second guess 'git checkout <no-such-branch>'")),
1d0fa898
NTND
1162 OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees,
1163 N_("do not check if another worktree is holding the given ref")),
870ebdb9 1164 OPT_BOOL(0, "progress", &opts.show_progress, N_("force progress reporting")),
b249b552 1165 OPT_END(),
782c2d65
DB
1166 };
1167
1168 memset(&opts, 0, sizeof(opts));
1169 memset(&new, 0, sizeof(new));
c1d7036b 1170 opts.overwrite_ignore = 1;
e51e3057 1171 opts.prefix = prefix;
870ebdb9 1172 opts.show_progress = -1;
782c2d65 1173
23b4c7bc 1174 gitmodules_config();
175f6e59 1175 git_config(git_checkout_config, &opts);
782c2d65 1176
9188ed89 1177 opts.track = BRANCH_TRACK_UNSPECIFIED;
782c2d65 1178
37782920 1179 argc = parse_options(argc, argv, prefix, options, checkout_usage,
f5242ebf 1180 PARSE_OPT_KEEP_DASHDASH);
859fdaba 1181
870ebdb9
ECA
1182 if (opts.show_progress < 0) {
1183 if (opts.quiet)
1184 opts.show_progress = 0;
1185 else
1186 opts.show_progress = isatty(2);
1187 }
1188
b6312c27
NTND
1189 if (conflict_style) {
1190 opts.merge = 1; /* implied */
1191 git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
1192 }
02ac9837 1193
b6312c27
NTND
1194 if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)
1195 die(_("-b, -B and --orphan are mutually exclusive"));
02ac9837 1196
b6312c27
NTND
1197 /*
1198 * From here on, new_branch will contain the branch to be checked out,
1199 * and new_branch_force and new_orphan_branch will tell us which one of
1200 * -b/-B/--orphan is being used.
1201 */
02ac9837
TRC
1202 if (opts.new_branch_force)
1203 opts.new_branch = opts.new_branch_force;
1204
b6312c27
NTND
1205 if (opts.new_orphan_branch)
1206 opts.new_branch = opts.new_orphan_branch;
32669671 1207
b6312c27
NTND
1208 /* --track without -b/-B/--orphan should DWIM */
1209 if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {
9188ed89
AR
1210 const char *argv0 = argv[0];
1211 if (!argc || !strcmp(argv0, "--"))
e8a8a4d7 1212 die (_("--track needs a branch name"));
e3f1da98
RS
1213 skip_prefix(argv0, "refs/", &argv0);
1214 skip_prefix(argv0, "remotes/", &argv0);
9188ed89
AR
1215 argv0 = strchr(argv0, '/');
1216 if (!argv0 || !argv0[1])
e8a8a4d7 1217 die (_("Missing branch name; try -b"));
9188ed89 1218 opts.new_branch = argv0 + 1;
bb0ceb62
JS
1219 }
1220
859fdaba 1221 /*
09ebad6f
JN
1222 * Extract branch name from command line arguments, so
1223 * all that is left is pathspecs.
859fdaba 1224 *
09ebad6f 1225 * Handle
70c9ac2f 1226 *
09ebad6f
JN
1227 * 1) git checkout <tree> -- [<paths>]
1228 * 2) git checkout -- [<paths>]
1229 * 3) git checkout <something> [<paths>]
859fdaba 1230 *
09ebad6f
JN
1231 * including "last branch" syntax and DWIM-ery for names of
1232 * remote branches, erroring out for invalid or ambiguous cases.
859fdaba 1233 */
782c2d65 1234 if (argc) {
60af7691 1235 struct object_id rev;
09ebad6f 1236 int dwim_ok =
e51e3057 1237 !opts.patch_mode &&
09ebad6f
JN
1238 dwim_new_local_branch &&
1239 opts.track == BRANCH_TRACK_UNSPECIFIED &&
1240 !opts.new_branch;
f8bd36a4 1241 int n = parse_branchname_arg(argc, argv, dwim_ok,
60af7691 1242 &new, &opts, &rev);
09ebad6f
JN
1243 argv += n;
1244 argc -= n;
782c2d65
DB
1245 }
1246
782c2d65 1247 if (argc) {
480ca644
NTND
1248 parse_pathspec(&opts.pathspec, 0,
1249 opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
1250 prefix, argv);
301e42ed 1251
817b345a 1252 if (!opts.pathspec.nr)
e8a8a4d7 1253 die(_("invalid path specification"));
301e42ed 1254
b6312c27
NTND
1255 /*
1256 * Try to give more helpful suggestion.
1257 * new_branch && argc > 1 will be caught later.
1258 */
1259 if (opts.new_branch && argc == 1)
1260 die(_("Cannot update paths and switch to branch '%s' at the same time.\n"
1261 "Did you intend to checkout '%s' which can not be resolved as commit?"),
1262 opts.new_branch, argv[0]);
782c2d65 1263
32669671 1264 if (opts.force_detach)
b6312c27
NTND
1265 die(_("git checkout: --detach does not take a path argument '%s'"),
1266 argv[0]);
32669671 1267
0cf8581e 1268 if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
b6312c27
NTND
1269 die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1270 "checking out of the index."));
782c2d65
DB
1271 }
1272
352eadc4 1273 if (opts.new_branch) {
f285a2d7 1274 struct strbuf buf = STRBUF_INIT;
55c4a673 1275
b6312c27
NTND
1276 opts.branch_exists =
1277 validate_new_branchname(opts.new_branch, &buf,
1278 !!opts.new_branch_force,
1279 !!opts.new_branch_force);
55c4a673 1280
352eadc4
DB
1281 strbuf_release(&buf);
1282 }
1283
817b345a 1284 if (opts.patch_mode || opts.pathspec.nr)
b6312c27
NTND
1285 return checkout_paths(&opts, new.name);
1286 else
1287 return checkout_branch(&opts, &new);
782c2d65 1288}