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