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