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