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