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