]>
Commit | Line | Data |
---|---|---|
07047d68 | 1 | #define USE_THE_INDEX_VARIABLE |
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" | |
32a8f510 | 12 | #include "environment.h" |
f394e093 | 13 | #include "gettext.h" |
41771fa4 | 14 | #include "hex.h" |
72ddf34d | 15 | #include "hook.h" |
67238999 | 16 | #include "merge-ll.h" |
697cc8ef | 17 | #include "lockfile.h" |
5bc07225 | 18 | #include "mem-pool.h" |
0dabeffc | 19 | #include "merge-recursive.h" |
dabab1d6 | 20 | #include "object-name.h" |
a034e910 | 21 | #include "object-store-ll.h" |
782c2d65 | 22 | #include "parse-options.h" |
c339932b | 23 | #include "path.h" |
fbffdfb1 | 24 | #include "preload-index.h" |
08c46a49 | 25 | #include "read-cache.h" |
782c2d65 | 26 | #include "refs.h" |
0dabeffc NTND |
27 | #include "remote.h" |
28 | #include "resolve-undo.h" | |
29 | #include "revision.h" | |
30 | #include "run-command.h" | |
e38da487 | 31 | #include "setup.h" |
0dabeffc NTND |
32 | #include "submodule.h" |
33 | #include "submodule-config.h" | |
cb2a5135 | 34 | #include "symlinks.h" |
74ea5c95 | 35 | #include "trace2.h" |
782c2d65 DB |
36 | #include "tree.h" |
37 | #include "tree-walk.h" | |
38 | #include "unpack-trees.h" | |
c45f0f52 | 39 | #include "wt-status.h" |
0cf8581e | 40 | #include "xdiff-interface.h" |
d052cc03 | 41 | #include "entry.h" |
60539506 | 42 | #include "parallel-checkout.h" |
d21878f0 | 43 | #include "add-interactive.h" |
fa655d84 | 44 | |
782c2d65 | 45 | static const char * const checkout_usage[] = { |
9c9b4f2f AH |
46 | N_("git checkout [<options>] <branch>"), |
47 | N_("git checkout [<options>] [<branch>] -- <file>..."), | |
782c2d65 DB |
48 | NULL, |
49 | }; | |
50 | ||
d787d311 NTND |
51 | static const char * const switch_branch_usage[] = { |
52 | N_("git switch [<options>] [<branch>]"), | |
53 | NULL, | |
54 | }; | |
55 | ||
46e91b66 | 56 | static const char * const restore_usage[] = { |
c9c935f6 | 57 | N_("git restore [<options>] [--source=<branch>] <file>..."), |
46e91b66 NTND |
58 | NULL, |
59 | }; | |
60 | ||
db941099 | 61 | struct checkout_opts { |
e51e3057 | 62 | int patch_mode; |
db941099 JH |
63 | int quiet; |
64 | int merge; | |
65 | int force; | |
32669671 | 66 | int force_detach; |
7968bef0 | 67 | int implicit_detach; |
38901a48 | 68 | int writeout_stage; |
c1d7036b | 69 | int overwrite_ignore; |
08d595dc | 70 | int ignore_skipworktree; |
1d0fa898 | 71 | int ignore_other_worktrees; |
870ebdb9 | 72 | int show_progress; |
0f086e6d | 73 | int count_checkout_paths; |
091e04bc | 74 | int overlay_mode; |
ccb111b3 | 75 | int dwim_new_local_branch; |
3ec37ad1 | 76 | int discard_changes; |
c9c935f6 | 77 | int accept_ref; |
5c06e269 | 78 | int accept_pathspec; |
e342c63a | 79 | int switch_branch_doing_nothing_is_ok; |
65f099b3 | 80 | int only_merge_on_switching_branches; |
c45f0f52 | 81 | int can_switch_when_in_progress; |
1806c29f | 82 | int orphan_from_empty_tree; |
be8ed502 | 83 | int empty_pathspec_ok; |
183fb44f NTND |
84 | int checkout_index; |
85 | int checkout_worktree; | |
a5e5f399 NTND |
86 | const char *ignore_unmerged_opt; |
87 | int ignore_unmerged; | |
a9aecc7a | 88 | int pathspec_file_nul; |
7ce4088a | 89 | char *pathspec_from_file; |
db941099 JH |
90 | |
91 | const char *new_branch; | |
02ac9837 | 92 | const char *new_branch_force; |
9db5ebf4 | 93 | const char *new_orphan_branch; |
db941099 JH |
94 | int new_branch_log; |
95 | enum branch_track track; | |
175f6e59 | 96 | struct diff_options diff_options; |
55cf704a | 97 | char *conflict_style; |
e51e3057 NTND |
98 | |
99 | int branch_exists; | |
100 | const char *prefix; | |
817b345a | 101 | struct pathspec pathspec; |
c9c935f6 | 102 | const char *from_treeish; |
e51e3057 | 103 | struct tree *source_tree; |
db941099 JH |
104 | }; |
105 | ||
a8604766 | 106 | struct branch_info { |
9081a421 ÆAB |
107 | char *name; /* The short name used */ |
108 | char *path; /* The full name of a real branch */ | |
a8604766 | 109 | struct commit *commit; /* The named commit */ |
c397aac0 | 110 | char *refname; /* The full name of the ref being checked out. */ |
111 | struct object_id oid; /* The object ID of the commit being checked out. */ | |
a8604766 | 112 | /* |
113 | * if not null the branch is detached because it's already | |
114 | * checked out in this checkout | |
115 | */ | |
116 | char *checkout; | |
117 | }; | |
118 | ||
9081a421 ÆAB |
119 | static void branch_info_release(struct branch_info *info) |
120 | { | |
121 | free(info->name); | |
122 | free(info->path); | |
123 | free(info->refname); | |
124 | free(info->checkout); | |
125 | } | |
126 | ||
c8a3ea1f | 127 | static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit, |
782c2d65 DB |
128 | int changed) |
129 | { | |
72ddf34d | 130 | return run_hooks_l("post-checkout", |
14228447 | 131 | oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()), |
132 | oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()), | |
15048f8a | 133 | changed ? "1" : "0", NULL); |
c8a3ea1f | 134 | /* "new_commit" can be NULL when checking out from the index before |
2292ce47 | 135 | a commit exists. */ |
ae98a008 | 136 | |
782c2d65 DB |
137 | } |
138 | ||
df46d77e | 139 | static int update_some(const struct object_id *oid, struct strbuf *base, |
5cf88fd8 | 140 | const char *pathname, unsigned mode, void *context UNUSED) |
782c2d65 DB |
141 | { |
142 | int len; | |
143 | struct cache_entry *ce; | |
c5326bd6 | 144 | int pos; |
782c2d65 | 145 | |
782c2d65 DB |
146 | if (S_ISDIR(mode)) |
147 | return READ_TREE_RECURSIVE; | |
148 | ||
6a0b0b6d | 149 | len = base->len + strlen(pathname); |
a849735b | 150 | ce = make_empty_cache_entry(&the_index, len); |
df46d77e | 151 | oidcpy(&ce->oid, oid); |
6a0b0b6d NTND |
152 | memcpy(ce->name, base->buf, base->len); |
153 | memcpy(ce->name + base->len, pathname, len - base->len); | |
b60e188c TG |
154 | ce->ce_flags = create_ce_flags(0) | CE_UPDATE; |
155 | ce->ce_namelen = len; | |
782c2d65 | 156 | ce->ce_mode = create_ce_mode(mode); |
c5326bd6 JK |
157 | |
158 | /* | |
159 | * If the entry is the same as the current index, we can leave the old | |
160 | * entry in place. Whether it is UPTODATE or not, checkout_entry will | |
161 | * do the right thing. | |
162 | */ | |
07047d68 | 163 | pos = index_name_pos(&the_index, ce->name, ce->ce_namelen); |
c5326bd6 | 164 | if (pos >= 0) { |
dc594180 | 165 | struct cache_entry *old = the_index.cache[pos]; |
c5326bd6 | 166 | if (ce->ce_mode == old->ce_mode && |
ecd72042 | 167 | !ce_intent_to_add(old) && |
4a7e27e9 | 168 | oideq(&ce->oid, &old->oid)) { |
c5326bd6 | 169 | old->ce_flags |= CE_UPDATE; |
a849735b | 170 | discard_cache_entry(ce); |
c5326bd6 JK |
171 | return 0; |
172 | } | |
173 | } | |
174 | ||
031b2033 ÆAB |
175 | add_index_entry(&the_index, ce, |
176 | ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); | |
782c2d65 DB |
177 | return 0; |
178 | } | |
179 | ||
18e4f405 | 180 | static int read_tree_some(struct tree *tree, const struct pathspec *pathspec) |
782c2d65 | 181 | { |
47957485 ÆAB |
182 | read_tree(the_repository, tree, |
183 | pathspec, update_some, NULL); | |
782c2d65 | 184 | |
782c2d65 DB |
185 | /* update the index with the given tree's info |
186 | * for all args, expanding wildcards, and exit | |
187 | * with any non-zero return code. | |
188 | */ | |
189 | return 0; | |
190 | } | |
191 | ||
9c5e6c80 | 192 | static int skip_same_name(const struct cache_entry *ce, int pos) |
8fdcf312 | 193 | { |
dc594180 ÆAB |
194 | while (++pos < the_index.cache_nr && |
195 | !strcmp(the_index.cache[pos]->name, ce->name)) | |
8fdcf312 JH |
196 | ; /* skip */ |
197 | return pos; | |
198 | } | |
199 | ||
091e04bc TG |
200 | static int check_stage(int stage, const struct cache_entry *ce, int pos, |
201 | int overlay_mode) | |
38901a48 | 202 | { |
dc594180 ÆAB |
203 | while (pos < the_index.cache_nr && |
204 | !strcmp(the_index.cache[pos]->name, ce->name)) { | |
205 | if (ce_stage(the_index.cache[pos]) == stage) | |
38901a48 JH |
206 | return 0; |
207 | pos++; | |
208 | } | |
091e04bc TG |
209 | if (!overlay_mode) |
210 | return 0; | |
9f97ab08 ÆAB |
211 | if (stage == 2) |
212 | return error(_("path '%s' does not have our version"), ce->name); | |
213 | else | |
214 | return error(_("path '%s' does not have their version"), ce->name); | |
38901a48 JH |
215 | } |
216 | ||
9c5e6c80 | 217 | static int check_stages(unsigned stages, const struct cache_entry *ce, int pos) |
0cf8581e | 218 | { |
fbbccd0a JH |
219 | unsigned seen = 0; |
220 | const char *name = ce->name; | |
221 | ||
dc594180 ÆAB |
222 | while (pos < the_index.cache_nr) { |
223 | ce = the_index.cache[pos]; | |
fbbccd0a JH |
224 | if (strcmp(name, ce->name)) |
225 | break; | |
226 | seen |= (1 << ce_stage(ce)); | |
227 | pos++; | |
228 | } | |
229 | if ((stages & seen) != stages) | |
230 | return error(_("path '%s' does not have all necessary versions"), | |
231 | name); | |
0cf8581e JH |
232 | return 0; |
233 | } | |
234 | ||
ce25e4c7 | 235 | static int checkout_stage(int stage, const struct cache_entry *ce, int pos, |
7d0c1f45 JH |
236 | const struct checkout *state, int *nr_checkouts, |
237 | int overlay_mode) | |
38901a48 | 238 | { |
dc594180 ÆAB |
239 | while (pos < the_index.cache_nr && |
240 | !strcmp(the_index.cache[pos]->name, ce->name)) { | |
241 | if (ce_stage(the_index.cache[pos]) == stage) | |
242 | return checkout_entry(the_index.cache[pos], state, | |
0f086e6d | 243 | NULL, nr_checkouts); |
38901a48 JH |
244 | pos++; |
245 | } | |
091e04bc | 246 | if (!overlay_mode) { |
4002ec3d | 247 | unlink_entry(ce, NULL); |
091e04bc TG |
248 | return 0; |
249 | } | |
9f97ab08 ÆAB |
250 | if (stage == 2) |
251 | return error(_("path '%s' does not have our version"), ce->name); | |
252 | else | |
253 | return error(_("path '%s' does not have their version"), ce->name); | |
38901a48 | 254 | } |
8fdcf312 | 255 | |
60539506 MT |
256 | static int checkout_merged(int pos, const struct checkout *state, |
257 | int *nr_checkouts, struct mem_pool *ce_mem_pool) | |
0cf8581e | 258 | { |
dc594180 | 259 | struct cache_entry *ce = the_index.cache[pos]; |
0cf8581e JH |
260 | const char *path = ce->name; |
261 | mmfile_t ancestor, ours, theirs; | |
35f69671 | 262 | enum ll_merge_result merge_status; |
0cf8581e | 263 | int status; |
60af7691 | 264 | struct object_id oid; |
0cf8581e | 265 | mmbuffer_t result_buf; |
60af7691 | 266 | struct object_id threeway[3]; |
335c6e40 | 267 | unsigned mode = 0; |
00906d6f EN |
268 | struct ll_merge_options ll_opts; |
269 | int renormalize = 0; | |
0cf8581e | 270 | |
fbbccd0a | 271 | memset(threeway, 0, sizeof(threeway)); |
dc594180 | 272 | while (pos < the_index.cache_nr) { |
fbbccd0a JH |
273 | int stage; |
274 | stage = ce_stage(ce); | |
275 | if (!stage || strcmp(path, ce->name)) | |
276 | break; | |
60af7691 | 277 | oidcpy(&threeway[stage - 1], &ce->oid); |
fbbccd0a JH |
278 | if (stage == 2) |
279 | mode = create_ce_mode(ce->ce_mode); | |
280 | pos++; | |
dc594180 | 281 | ce = the_index.cache[pos]; |
fbbccd0a | 282 | } |
60af7691 | 283 | if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2])) |
fbbccd0a | 284 | return error(_("path '%s' does not have necessary versions"), path); |
0cf8581e | 285 | |
d449347d | 286 | read_mmblob(&ancestor, &threeway[0]); |
287 | read_mmblob(&ours, &threeway[1]); | |
288 | read_mmblob(&theirs, &threeway[2]); | |
0cf8581e | 289 | |
00906d6f EN |
290 | memset(&ll_opts, 0, sizeof(ll_opts)); |
291 | git_config_get_bool("merge.renormalize", &renormalize); | |
292 | ll_opts.renormalize = renormalize; | |
35f69671 EN |
293 | merge_status = ll_merge(&result_buf, path, &ancestor, "base", |
294 | &ours, "ours", &theirs, "theirs", | |
295 | state->istate, &ll_opts); | |
0cf8581e JH |
296 | free(ancestor.ptr); |
297 | free(ours.ptr); | |
298 | free(theirs.ptr); | |
35f69671 EN |
299 | if (merge_status == LL_MERGE_BINARY_CONFLICT) |
300 | warning("Cannot merge binary files: %s (%s vs. %s)", | |
301 | path, "ours", "theirs"); | |
302 | if (merge_status < 0 || !result_buf.ptr) { | |
0cf8581e | 303 | free(result_buf.ptr); |
e8a8a4d7 | 304 | return error(_("path '%s': cannot merge"), path); |
0cf8581e JH |
305 | } |
306 | ||
307 | /* | |
308 | * NEEDSWORK: | |
309 | * There is absolutely no reason to write this as a blob object | |
514e8039 JS |
310 | * and create a phony cache entry. This hack is primarily to get |
311 | * to the write_entry() machinery that massages the contents to | |
312 | * work-tree format and writes out which only allows it for a | |
313 | * cache entry. The code in write_entry() needs to be refactored | |
314 | * to allow us to feed a <buffer, size, mode> instead of a cache | |
315 | * entry. Such a refactoring would help merge_recursive as well | |
316 | * (it also writes the merge result to the object database even | |
317 | * when it may contain conflicts). | |
0cf8581e | 318 | */ |
c80d226a | 319 | if (write_object_file(result_buf.ptr, result_buf.size, OBJ_BLOB, &oid)) |
e8a8a4d7 | 320 | die(_("Unable to add merge result for '%s'"), path); |
443a12f3 | 321 | free(result_buf.ptr); |
60539506 | 322 | ce = make_transient_cache_entry(mode, &oid, path, 2, ce_mem_pool); |
048f2762 | 323 | if (!ce) |
e8a8a4d7 | 324 | die(_("make_cache_entry failed for path '%s'"), path); |
0f086e6d | 325 | status = checkout_entry(ce, state, NULL, nr_checkouts); |
0cf8581e JH |
326 | return status; |
327 | } | |
8fdcf312 | 328 | |
091e04bc TG |
329 | static void mark_ce_for_checkout_overlay(struct cache_entry *ce, |
330 | char *ps_matched, | |
331 | const struct checkout_opts *opts) | |
b7033e73 TG |
332 | { |
333 | ce->ce_flags &= ~CE_MATCHED; | |
334 | if (!opts->ignore_skipworktree && ce_skip_worktree(ce)) | |
335 | return; | |
336 | if (opts->source_tree && !(ce->ce_flags & CE_UPDATE)) | |
337 | /* | |
338 | * "git checkout tree-ish -- path", but this entry | |
339 | * is in the original index but is not in tree-ish | |
340 | * or does not match the pathspec; it will not be | |
341 | * checked out to the working tree. We will not do | |
342 | * anything to this entry at all. | |
343 | */ | |
344 | return; | |
345 | /* | |
346 | * Either this entry came from the tree-ish we are | |
347 | * checking the paths out of, or we are checking out | |
348 | * of the index. | |
349 | * | |
350 | * If it comes from the tree-ish, we already know it | |
351 | * matches the pathspec and could just stamp | |
352 | * CE_MATCHED to it from update_some(). But we still | |
47957485 | 353 | * need ps_matched and read_tree (and |
b7033e73 TG |
354 | * eventually tree_entry_interesting) cannot fill |
355 | * ps_matched yet. Once it can, we can avoid calling | |
356 | * match_pathspec() for _all_ entries when | |
357 | * opts->source_tree != NULL. | |
358 | */ | |
359 | if (ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) | |
360 | ce->ce_flags |= CE_MATCHED; | |
361 | } | |
362 | ||
091e04bc TG |
363 | static void mark_ce_for_checkout_no_overlay(struct cache_entry *ce, |
364 | char *ps_matched, | |
365 | const struct checkout_opts *opts) | |
366 | { | |
367 | ce->ce_flags &= ~CE_MATCHED; | |
368 | if (!opts->ignore_skipworktree && ce_skip_worktree(ce)) | |
369 | return; | |
370 | if (ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) { | |
371 | ce->ce_flags |= CE_MATCHED; | |
372 | if (opts->source_tree && !(ce->ce_flags & CE_UPDATE)) | |
373 | /* | |
374 | * In overlay mode, but the path is not in | |
375 | * tree-ish, which means we should remove it | |
376 | * from the index and the working tree. | |
377 | */ | |
378 | ce->ce_flags |= CE_REMOVE | CE_WT_REMOVE; | |
379 | } | |
380 | } | |
381 | ||
a8604766 | 382 | static int checkout_worktree(const struct checkout_opts *opts, |
383 | const struct branch_info *info) | |
4058199c NTND |
384 | { |
385 | struct checkout state = CHECKOUT_INIT; | |
386 | int nr_checkouts = 0, nr_unmerged = 0; | |
387 | int errs = 0; | |
388 | int pos; | |
60539506 MT |
389 | int pc_workers, pc_threshold; |
390 | struct mem_pool ce_mem_pool; | |
4058199c NTND |
391 | |
392 | state.force = 1; | |
393 | state.refresh_cache = 1; | |
394 | state.istate = &the_index; | |
395 | ||
60539506 MT |
396 | mem_pool_init(&ce_mem_pool, 0); |
397 | get_parallel_checkout_configs(&pc_workers, &pc_threshold); | |
c397aac0 | 398 | init_checkout_metadata(&state.meta, info->refname, |
399 | info->commit ? &info->commit->object.oid : &info->oid, | |
400 | NULL); | |
401 | ||
4058199c | 402 | enable_delayed_checkout(&state); |
0f6d3ba6 | 403 | |
60539506 MT |
404 | if (pc_workers > 1) |
405 | init_parallel_checkout(); | |
406 | ||
dc594180 ÆAB |
407 | for (pos = 0; pos < the_index.cache_nr; pos++) { |
408 | struct cache_entry *ce = the_index.cache[pos]; | |
4058199c NTND |
409 | if (ce->ce_flags & CE_MATCHED) { |
410 | if (!ce_stage(ce)) { | |
411 | errs |= checkout_entry(ce, &state, | |
412 | NULL, &nr_checkouts); | |
413 | continue; | |
414 | } | |
415 | if (opts->writeout_stage) | |
416 | errs |= checkout_stage(opts->writeout_stage, | |
417 | ce, pos, | |
418 | &state, | |
419 | &nr_checkouts, opts->overlay_mode); | |
420 | else if (opts->merge) | |
421 | errs |= checkout_merged(pos, &state, | |
60539506 MT |
422 | &nr_unmerged, |
423 | &ce_mem_pool); | |
4058199c NTND |
424 | pos = skip_same_name(ce, pos) - 1; |
425 | } | |
426 | } | |
60539506 MT |
427 | if (pc_workers > 1) |
428 | errs |= run_parallel_checkout(&state, pc_workers, pc_threshold, | |
429 | NULL, NULL); | |
430 | mem_pool_discard(&ce_mem_pool, should_validate_cache_entries()); | |
4058199c NTND |
431 | remove_marked_cache_entries(&the_index, 1); |
432 | remove_scheduled_dirs(); | |
611c7785 | 433 | errs |= finish_delayed_checkout(&state, opts->show_progress); |
4058199c NTND |
434 | |
435 | if (opts->count_checkout_paths) { | |
436 | if (nr_unmerged) | |
437 | fprintf_ln(stderr, Q_("Recreated %d merge conflict", | |
438 | "Recreated %d merge conflicts", | |
439 | nr_unmerged), | |
440 | nr_unmerged); | |
441 | if (opts->source_tree) | |
442 | fprintf_ln(stderr, Q_("Updated %d path from %s", | |
443 | "Updated %d paths from %s", | |
444 | nr_checkouts), | |
445 | nr_checkouts, | |
d850b7a5 ÆAB |
446 | repo_find_unique_abbrev(the_repository, &opts->source_tree->object.oid, |
447 | DEFAULT_ABBREV)); | |
4058199c NTND |
448 | else if (!nr_unmerged || nr_checkouts) |
449 | fprintf_ln(stderr, Q_("Updated %d path from the index", | |
450 | "Updated %d paths from the index", | |
451 | nr_checkouts), | |
452 | nr_checkouts); | |
453 | } | |
454 | ||
455 | return errs; | |
456 | } | |
457 | ||
b6312c27 | 458 | static int checkout_paths(const struct checkout_opts *opts, |
a8604766 | 459 | const struct branch_info *new_branch_info) |
782c2d65 DB |
460 | { |
461 | int pos; | |
782c2d65 | 462 | static char *ps_matched; |
60af7691 | 463 | struct object_id rev; |
782c2d65 | 464 | struct commit *head; |
d2b3691b | 465 | int errs = 0; |
837e34eb | 466 | struct lock_file lock_file = LOCK_INIT; |
183fb44f | 467 | int checkout_index; |
b6312c27 | 468 | |
e27dd8ae JH |
469 | trace2_cmd_mode(opts->patch_mode ? "patch" : "path"); |
470 | ||
b6312c27 NTND |
471 | if (opts->track != BRANCH_TRACK_UNSPECIFIED) |
472 | die(_("'%s' cannot be used with updating paths"), "--track"); | |
473 | ||
474 | if (opts->new_branch_log) | |
475 | die(_("'%s' cannot be used with updating paths"), "-l"); | |
476 | ||
a5e5f399 NTND |
477 | if (opts->ignore_unmerged && opts->patch_mode) |
478 | die(_("'%s' cannot be used with updating paths"), | |
479 | opts->ignore_unmerged_opt); | |
b6312c27 NTND |
480 | |
481 | if (opts->force_detach) | |
482 | die(_("'%s' cannot be used with updating paths"), "--detach"); | |
483 | ||
484 | if (opts->merge && opts->patch_mode) | |
12909b6b | 485 | die(_("options '%s' and '%s' cannot be used together"), "--merge", "--patch"); |
b6312c27 | 486 | |
a5e5f399 | 487 | if (opts->ignore_unmerged && opts->merge) |
12909b6b | 488 | die(_("options '%s' and '%s' cannot be used together"), |
a5e5f399 | 489 | opts->ignore_unmerged_opt, "-m"); |
b6312c27 NTND |
490 | |
491 | if (opts->new_branch) | |
492 | die(_("Cannot update paths and switch to branch '%s' at the same time."), | |
493 | opts->new_branch); | |
494 | ||
183fb44f NTND |
495 | if (!opts->checkout_worktree && !opts->checkout_index) |
496 | die(_("neither '%s' or '%s' is specified"), | |
497 | "--staged", "--worktree"); | |
498 | ||
499 | if (!opts->checkout_worktree && !opts->from_treeish) | |
500 | die(_("'%s' must be used when '%s' is not specified"), | |
501 | "--worktree", "--source"); | |
502 | ||
ee8a8882 AK |
503 | /* |
504 | * Reject --staged option to the restore command when combined with | |
505 | * merge-related options. Use the accept_ref flag to distinguish it | |
506 | * from the checkout command, which does not accept --staged anyway. | |
507 | * | |
508 | * `restore --ours|--theirs --worktree --staged` could mean resolving | |
509 | * conflicted paths to one side in both the worktree and the index, | |
510 | * but does not currently. | |
511 | * | |
512 | * `restore --merge|--conflict=<style>` already recreates conflicts | |
513 | * in both the worktree and the index, so adding --staged would be | |
514 | * meaningless. | |
515 | */ | |
516 | if (!opts->accept_ref && opts->checkout_index) { | |
517 | if (opts->writeout_stage) | |
518 | die(_("'%s' or '%s' cannot be used with %s"), | |
519 | "--ours", "--theirs", "--staged"); | |
520 | ||
521 | if (opts->merge) | |
522 | die(_("'%s' or '%s' cannot be used with %s"), | |
523 | "--merge", "--conflict", "--staged"); | |
524 | } | |
e3ddd3b5 | 525 | |
183fb44f | 526 | if (opts->patch_mode) { |
d21878f0 | 527 | enum add_p_mode patch_mode; |
5602b500 DL |
528 | const char *rev = new_branch_info->name; |
529 | char rev_oid[GIT_MAX_HEXSZ + 1]; | |
530 | ||
531 | /* | |
532 | * Since rev can be in the form of `<a>...<b>` (which is not | |
533 | * recognized by diff-index), we will always replace the name | |
534 | * with the hex of the commit (whether it's in `...` form or | |
535 | * not) for the run_add_interactive() machinery to work | |
536 | * properly. However, there is special logic for the HEAD case | |
5c29f19c JS |
537 | * so we mustn't replace that. Also, when we were given a |
538 | * tree-object, new_branch_info->commit would be NULL, but we | |
539 | * do not have to do any replacement, either. | |
5602b500 | 540 | */ |
5c29f19c | 541 | if (rev && new_branch_info->commit && strcmp(rev, "HEAD")) |
5602b500 | 542 | rev = oid_to_hex_r(rev_oid, &new_branch_info->commit->object.oid); |
183fb44f NTND |
543 | |
544 | if (opts->checkout_index && opts->checkout_worktree) | |
d21878f0 | 545 | patch_mode = ADD_P_CHECKOUT; |
183fb44f | 546 | else if (opts->checkout_index && !opts->checkout_worktree) |
d21878f0 | 547 | patch_mode = ADD_P_RESET; |
2f0896ec | 548 | else if (!opts->checkout_index && opts->checkout_worktree) |
d21878f0 | 549 | patch_mode = ADD_P_WORKTREE; |
183fb44f | 550 | else |
2f0896ec NTND |
551 | BUG("either flag must have been set, worktree=%d, index=%d", |
552 | opts->checkout_worktree, opts->checkout_index); | |
d21878f0 ÆAB |
553 | return !!run_add_p(the_repository, patch_mode, rev, |
554 | &opts->pathspec); | |
183fb44f | 555 | } |
b6312c27 | 556 | |
fb4a8464 | 557 | repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR); |
07047d68 | 558 | if (repo_read_index_preload(the_repository, &opts->pathspec, 0) < 0) |
e923a8ab | 559 | return error(_("index file corrupt")); |
75336878 | 560 | |
e51e3057 | 561 | if (opts->source_tree) |
18e4f405 | 562 | read_tree_some(opts->source_tree, &opts->pathspec); |
75336878 | 563 | |
8b54c234 | 564 | ps_matched = xcalloc(opts->pathspec.nr, 1); |
782c2d65 | 565 | |
e721c154 NTND |
566 | /* |
567 | * Make sure all pathspecs participated in locating the paths | |
568 | * to be checked out. | |
569 | */ | |
dc594180 | 570 | for (pos = 0; pos < the_index.cache_nr; pos++) |
091e04bc | 571 | if (opts->overlay_mode) |
dc594180 | 572 | mark_ce_for_checkout_overlay(the_index.cache[pos], |
091e04bc TG |
573 | ps_matched, |
574 | opts); | |
575 | else | |
dc594180 | 576 | mark_ce_for_checkout_no_overlay(the_index.cache[pos], |
091e04bc TG |
577 | ps_matched, |
578 | opts); | |
782c2d65 | 579 | |
c5c33504 | 580 | if (report_path_error(ps_matched, &opts->pathspec)) { |
e721c154 | 581 | free(ps_matched); |
782c2d65 | 582 | return 1; |
e721c154 NTND |
583 | } |
584 | free(ps_matched); | |
782c2d65 | 585 | |
4421a823 JH |
586 | /* "checkout -m path" to recreate conflicted state */ |
587 | if (opts->merge) | |
e721c154 | 588 | unmerge_marked_index(&the_index); |
4421a823 | 589 | |
8fdcf312 | 590 | /* Any unmerged paths? */ |
dc594180 ÆAB |
591 | for (pos = 0; pos < the_index.cache_nr; pos++) { |
592 | const struct cache_entry *ce = the_index.cache[pos]; | |
e721c154 | 593 | if (ce->ce_flags & CE_MATCHED) { |
8fdcf312 JH |
594 | if (!ce_stage(ce)) |
595 | continue; | |
a5e5f399 NTND |
596 | if (opts->ignore_unmerged) { |
597 | if (!opts->quiet) | |
598 | warning(_("path '%s' is unmerged"), ce->name); | |
f9022075 | 599 | } else if (opts->writeout_stage) { |
091e04bc | 600 | errs |= check_stage(opts->writeout_stage, ce, pos, opts->overlay_mode); |
0cf8581e | 601 | } else if (opts->merge) { |
fbbccd0a | 602 | errs |= check_stages((1<<2) | (1<<3), ce, pos); |
db941099 JH |
603 | } else { |
604 | errs = 1; | |
e8a8a4d7 | 605 | error(_("path '%s' is unmerged"), ce->name); |
db941099 | 606 | } |
8fdcf312 JH |
607 | pos = skip_same_name(ce, pos) - 1; |
608 | } | |
609 | } | |
610 | if (errs) | |
611 | return 1; | |
612 | ||
d2b3691b | 613 | /* Now we are committed to check them out */ |
183fb44f | 614 | if (opts->checkout_worktree) |
a8604766 | 615 | errs |= checkout_worktree(opts, new_branch_info); |
e701bab3 JK |
616 | else |
617 | remove_marked_cache_entries(&the_index, 1); | |
2841e8f8 | 618 | |
183fb44f NTND |
619 | /* |
620 | * Allow updating the index when checking out from the index. | |
621 | * This is to save new stat info. | |
622 | */ | |
623 | if (opts->checkout_worktree && !opts->checkout_index && !opts->source_tree) | |
624 | checkout_index = 1; | |
625 | else | |
626 | checkout_index = opts->checkout_index; | |
0f086e6d | 627 | |
183fb44f NTND |
628 | if (checkout_index) { |
629 | if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) | |
630 | die(_("unable to write new index file")); | |
631 | } else { | |
632 | /* | |
633 | * NEEDSWORK: if --worktree is not specified, we | |
634 | * should save stat info of checked out files in the | |
635 | * index to avoid the next (potentially costly) | |
636 | * refresh. But it's a bit tricker to do... | |
637 | */ | |
638 | rollback_lock_file(&lock_file); | |
0f086e6d | 639 | } |
782c2d65 | 640 | |
34c290a6 | 641 | read_ref_full("HEAD", 0, &rev, NULL); |
21e1ee8f | 642 | head = lookup_commit_reference_gently(the_repository, &rev, 1); |
782c2d65 | 643 | |
d2b3691b JH |
644 | errs |= post_checkout_hook(head, head, 0); |
645 | return errs; | |
782c2d65 DB |
646 | } |
647 | ||
a2b4994c NTND |
648 | static void show_local_changes(struct object *head, |
649 | const struct diff_options *opts) | |
782c2d65 DB |
650 | { |
651 | struct rev_info rev; | |
652 | /* I think we want full paths, even if we're in a subdirectory. */ | |
2abf3503 | 653 | repo_init_revisions(the_repository, &rev, NULL); |
175f6e59 | 654 | rev.diffopt.flags = opts->flags; |
782c2d65 | 655 | rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; |
49ff3cb9 | 656 | rev.diffopt.flags.recursive = 1; |
28452655 | 657 | diff_setup_done(&rev.diffopt); |
782c2d65 DB |
658 | add_pending_object(&rev, head, NULL); |
659 | run_diff_index(&rev, 0); | |
1878b5ed | 660 | release_revisions(&rev); |
782c2d65 DB |
661 | } |
662 | ||
b3c0494a | 663 | static void describe_detached_head(const char *msg, struct commit *commit) |
782c2d65 | 664 | { |
f285a2d7 | 665 | struct strbuf sb = STRBUF_INIT; |
ca69d4d5 | 666 | |
ecb5091f | 667 | if (!repo_parse_commit(the_repository, commit)) |
3c621839 | 668 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); |
ca69d4d5 AR |
669 | if (print_sha1_ellipsis()) { |
670 | fprintf(stderr, "%s %s... %s\n", msg, | |
d850b7a5 ÆAB |
671 | repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV), |
672 | sb.buf); | |
ca69d4d5 AR |
673 | } else { |
674 | fprintf(stderr, "%s %s %s\n", msg, | |
d850b7a5 ÆAB |
675 | repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV), |
676 | sb.buf); | |
ca69d4d5 | 677 | } |
782c2d65 DB |
678 | strbuf_release(&sb); |
679 | } | |
680 | ||
a2b4994c | 681 | static int reset_tree(struct tree *tree, const struct checkout_opts *o, |
13e7ed6a | 682 | int worktree, int *writeout_error, |
683 | struct branch_info *info) | |
782c2d65 DB |
684 | { |
685 | struct unpack_trees_options opts; | |
686 | struct tree_desc tree_desc; | |
bc052d7f | 687 | |
782c2d65 DB |
688 | memset(&opts, 0, sizeof(opts)); |
689 | opts.head_idx = -1; | |
6286a08d JH |
690 | opts.update = worktree; |
691 | opts.skip_unmerged = !worktree; | |
480d3d6b EN |
692 | opts.reset = o->force ? UNPACK_RESET_OVERWRITE_UNTRACKED : |
693 | UNPACK_RESET_PROTECT_UNTRACKED; | |
694 | opts.preserve_ignored = (!o->force && !o->overwrite_ignore); | |
782c2d65 DB |
695 | opts.merge = 1; |
696 | opts.fn = oneway_merge; | |
870ebdb9 | 697 | opts.verbose_update = o->show_progress; |
34110cd4 LT |
698 | opts.src_index = &the_index; |
699 | opts.dst_index = &the_index; | |
13e7ed6a | 700 | init_checkout_metadata(&opts.meta, info->refname, |
14228447 | 701 | info->commit ? &info->commit->object.oid : null_oid(), |
13e7ed6a | 702 | NULL); |
782c2d65 DB |
703 | parse_tree(tree); |
704 | init_tree_desc(&tree_desc, tree->buffer, tree->size); | |
291d823e JH |
705 | switch (unpack_trees(1, &tree_desc, &opts)) { |
706 | case -2: | |
a2b4994c | 707 | *writeout_error = 1; |
291d823e JH |
708 | /* |
709 | * We return 0 nevertheless, as the index is all right | |
710 | * and more importantly we have made best efforts to | |
711 | * update paths in the work tree, and we cannot revert | |
712 | * them. | |
713 | */ | |
1cf01a34 | 714 | /* fallthrough */ |
291d823e JH |
715 | case 0: |
716 | return 0; | |
717 | default: | |
84a5750b | 718 | return 128; |
291d823e | 719 | } |
782c2d65 DB |
720 | } |
721 | ||
782c2d65 DB |
722 | static void setup_branch_path(struct branch_info *branch) |
723 | { | |
f285a2d7 | 724 | struct strbuf buf = STRBUF_INIT; |
ae5a6c36 | 725 | |
c397aac0 | 726 | /* |
727 | * If this is a ref, resolve it; otherwise, look up the OID for our | |
728 | * expression. Failure here is okay. | |
729 | */ | |
12cb1c10 ÆAB |
730 | if (!repo_dwim_ref(the_repository, branch->name, strlen(branch->name), |
731 | &branch->oid, &branch->refname, 0)) | |
c397aac0 | 732 | repo_get_oid_committish(the_repository, branch->name, &branch->oid); |
733 | ||
fd4692ff | 734 | strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); |
9081a421 ÆAB |
735 | if (strcmp(buf.buf, branch->name)) { |
736 | free(branch->name); | |
ae5a6c36 | 737 | branch->name = xstrdup(buf.buf); |
9081a421 | 738 | } |
a552de75 | 739 | strbuf_splice(&buf, 0, 0, "refs/heads/", 11); |
9081a421 | 740 | free(branch->path); |
782c2d65 DB |
741 | branch->path = strbuf_detach(&buf, NULL); |
742 | } | |
743 | ||
33d0dda6 ÆAB |
744 | static void init_topts(struct unpack_trees_options *topts, int merge, |
745 | int show_progress, int overwrite_ignore, | |
746 | struct commit *old_commit) | |
747 | { | |
748 | memset(topts, 0, sizeof(*topts)); | |
749 | topts->head_idx = -1; | |
750 | topts->src_index = &the_index; | |
751 | topts->dst_index = &the_index; | |
752 | ||
753 | setup_unpack_trees_porcelain(topts, "checkout"); | |
754 | ||
fbc1ed62 | 755 | topts->initial_checkout = is_index_unborn(&the_index); |
33d0dda6 ÆAB |
756 | topts->update = 1; |
757 | topts->merge = 1; | |
758 | topts->quiet = merge && old_commit; | |
759 | topts->verbose_update = show_progress; | |
760 | topts->fn = twoway_merge; | |
761 | topts->preserve_ignored = !overwrite_ignore; | |
762 | } | |
763 | ||
a2b4994c | 764 | static int merge_working_tree(const struct checkout_opts *opts, |
c8a3ea1f BW |
765 | struct branch_info *old_branch_info, |
766 | struct branch_info *new_branch_info, | |
a2b4994c | 767 | int *writeout_error) |
782c2d65 DB |
768 | { |
769 | int ret; | |
837e34eb | 770 | struct lock_file lock_file = LOCK_INIT; |
1806c29f | 771 | struct tree *new_tree; |
b96524f8 | 772 | |
07047d68 ÆAB |
773 | repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR); |
774 | if (repo_read_index_preload(the_repository, NULL, 0) < 0) | |
e923a8ab | 775 | return error(_("index file corrupt")); |
782c2d65 | 776 | |
031b2033 | 777 | resolve_undo_clear_index(&the_index); |
1806c29f NTND |
778 | if (opts->new_orphan_branch && opts->orphan_from_empty_tree) { |
779 | if (new_branch_info->commit) | |
780 | BUG("'switch --orphan' should never accept a commit as starting point"); | |
781 | new_tree = parse_tree_indirect(the_hash_algo->empty_tree); | |
782 | } else | |
ecb5091f ÆAB |
783 | new_tree = repo_get_commit_tree(the_repository, |
784 | new_branch_info->commit); | |
3ec37ad1 | 785 | if (opts->discard_changes) { |
13e7ed6a | 786 | ret = reset_tree(new_tree, opts, 1, writeout_error, new_branch_info); |
782c2d65 DB |
787 | if (ret) |
788 | return ret; | |
789 | } else { | |
790 | struct tree_desc trees[2]; | |
791 | struct tree *tree; | |
792 | struct unpack_trees_options topts; | |
8d2eaf64 | 793 | const struct object_id *old_commit_oid; |
bc052d7f | 794 | |
07047d68 | 795 | refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL); |
782c2d65 | 796 | |
fbc1ed62 | 797 | if (unmerged_index(&the_index)) { |
e8a8a4d7 | 798 | error(_("you need to resolve your current index first")); |
04c9e11f | 799 | return 1; |
782c2d65 | 800 | } |
04c9e11f JH |
801 | |
802 | /* 2-way merge to the new branch */ | |
33d0dda6 ÆAB |
803 | init_topts(&topts, opts->merge, opts->show_progress, |
804 | opts->overwrite_ignore, old_branch_info->commit); | |
13e7ed6a | 805 | init_checkout_metadata(&topts.meta, new_branch_info->refname, |
806 | new_branch_info->commit ? | |
807 | &new_branch_info->commit->object.oid : | |
808 | &new_branch_info->oid, NULL); | |
8d2eaf64 GC |
809 | |
810 | old_commit_oid = old_branch_info->commit ? | |
811 | &old_branch_info->commit->object.oid : | |
812 | the_hash_algo->empty_tree; | |
813 | tree = parse_tree_indirect(old_commit_oid); | |
814 | if (!tree) | |
815 | die(_("unable to parse commit %s"), | |
816 | oid_to_hex(old_commit_oid)); | |
817 | ||
04c9e11f | 818 | init_tree_desc(&trees[0], tree->buffer, tree->size); |
1806c29f NTND |
819 | parse_tree(new_tree); |
820 | tree = new_tree; | |
04c9e11f JH |
821 | init_tree_desc(&trees[1], tree->buffer, tree->size); |
822 | ||
291d823e | 823 | ret = unpack_trees(2, trees, &topts); |
1c41d280 | 824 | clear_unpack_trees_porcelain(&topts); |
49d833dc | 825 | if (ret == -1) { |
782c2d65 DB |
826 | /* |
827 | * Unpack couldn't do a trivial merge; either | |
828 | * give up or do a real merge, depending on | |
829 | * whether the merge flag was used. | |
830 | */ | |
782c2d65 | 831 | struct tree *work; |
6eff409e | 832 | struct tree *old_tree; |
8a2fce18 | 833 | struct merge_options o; |
a7256deb | 834 | struct strbuf sb = STRBUF_INIT; |
65c01c64 | 835 | struct strbuf old_commit_shortname = STRBUF_INIT; |
a7256deb | 836 | |
782c2d65 DB |
837 | if (!opts->merge) |
838 | return 1; | |
64da3ae5 JH |
839 | |
840 | /* | |
c8a3ea1f | 841 | * Without old_branch_info->commit, the below is the same as |
64da3ae5 JH |
842 | * the two-tree unpack we already tried and failed. |
843 | */ | |
c8a3ea1f | 844 | if (!old_branch_info->commit) |
64da3ae5 | 845 | return 1; |
ecb5091f ÆAB |
846 | old_tree = repo_get_commit_tree(the_repository, |
847 | old_branch_info->commit); | |
6eff409e NTND |
848 | |
849 | if (repo_index_has_changes(the_repository, old_tree, &sb)) | |
850 | die(_("cannot continue with staged changes in " | |
851 | "the following files:\n%s"), sb.buf); | |
852 | strbuf_release(&sb); | |
782c2d65 DB |
853 | |
854 | /* Do more real merge */ | |
855 | ||
856 | /* | |
857 | * We update the index fully, then write the | |
858 | * tree from the index, then merge the new | |
859 | * branch with the current tree, with the old | |
860 | * branch as the base. Then we reset the index | |
861 | * (but not the working tree) to the new | |
862 | * branch, leaving the working tree as the | |
863 | * merged version, but skipping unmerged | |
864 | * entries in the index. | |
865 | */ | |
866 | ||
50c37ee8 | 867 | add_files_to_cache(the_repository, NULL, NULL, 0, 0); |
0d6caa2d | 868 | init_merge_options(&o, the_repository); |
8a2fce18 | 869 | o.verbosity = 0; |
724dd767 | 870 | work = write_in_core_index_as_tree(the_repository); |
782c2d65 | 871 | |
1806c29f | 872 | ret = reset_tree(new_tree, |
2e27bd77 | 873 | opts, 1, |
13e7ed6a | 874 | writeout_error, new_branch_info); |
782c2d65 DB |
875 | if (ret) |
876 | return ret; | |
c8a3ea1f | 877 | o.ancestor = old_branch_info->name; |
afe8a907 | 878 | if (!old_branch_info->name) { |
65c01c64 EN |
879 | strbuf_add_unique_abbrev(&old_commit_shortname, |
880 | &old_branch_info->commit->object.oid, | |
881 | DEFAULT_ABBREV); | |
882 | o.ancestor = old_commit_shortname.buf; | |
883 | } | |
c8a3ea1f | 884 | o.branch1 = new_branch_info->name; |
8a2fce18 | 885 | o.branch2 = "local"; |
2e27bd77 | 886 | ret = merge_trees(&o, |
1806c29f | 887 | new_tree, |
2e27bd77 | 888 | work, |
b4db8a2b | 889 | old_tree); |
f241ff0d JS |
890 | if (ret < 0) |
891 | exit(128); | |
1806c29f | 892 | ret = reset_tree(new_tree, |
2e27bd77 | 893 | opts, 0, |
13e7ed6a | 894 | writeout_error, new_branch_info); |
548009c0 | 895 | strbuf_release(&o.obuf); |
65c01c64 | 896 | strbuf_release(&old_commit_shortname); |
84a5750b JH |
897 | if (ret) |
898 | return ret; | |
782c2d65 DB |
899 | } |
900 | } | |
901 | ||
dc594180 | 902 | if (!cache_tree_fully_valid(the_index.cache_tree)) |
3fd13cbc | 903 | cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); |
aecf567c | 904 | |
837e34eb | 905 | if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) |
e8a8a4d7 | 906 | die(_("unable to write new index file")); |
782c2d65 | 907 | |
1806c29f | 908 | if (!opts->discard_changes && !opts->quiet && new_branch_info->commit) |
c8a3ea1f | 909 | show_local_changes(&new_branch_info->commit->object, &opts->diff_options); |
782c2d65 DB |
910 | |
911 | return 0; | |
912 | } | |
913 | ||
c8a3ea1f | 914 | static void report_tracking(struct branch_info *new_branch_info) |
79a1e6b4 | 915 | { |
6d21bf96 | 916 | struct strbuf sb = STRBUF_INIT; |
c8a3ea1f | 917 | struct branch *branch = branch_get(new_branch_info->name); |
79a1e6b4 | 918 | |
b6f3da51 | 919 | if (!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL, 1)) |
79a1e6b4 | 920 | return; |
6d21bf96 JH |
921 | fputs(sb.buf, stdout); |
922 | strbuf_release(&sb); | |
b0030db3 | 923 | } |
79a1e6b4 | 924 | |
a2b4994c | 925 | static void update_refs_for_switch(const struct checkout_opts *opts, |
c8a3ea1f BW |
926 | struct branch_info *old_branch_info, |
927 | struct branch_info *new_branch_info) | |
782c2d65 | 928 | { |
f285a2d7 | 929 | struct strbuf msg = STRBUF_INIT; |
3bed291a | 930 | const char *old_desc, *reflog_msg; |
782c2d65 | 931 | if (opts->new_branch) { |
3631bf77 | 932 | if (opts->new_orphan_branch) { |
341fb286 CW |
933 | char *refname; |
934 | ||
935 | refname = mkpathdup("refs/heads/%s", opts->new_orphan_branch); | |
936 | if (opts->new_branch_log && | |
937 | !should_autocreate_reflog(refname)) { | |
1a83c240 | 938 | int ret; |
a4c653df | 939 | struct strbuf err = STRBUF_INIT; |
3631bf77 | 940 | |
7b089120 | 941 | ret = safe_create_reflog(refname, &err); |
1a83c240 | 942 | if (ret) { |
a4c653df DT |
943 | fprintf(stderr, _("Can not do reflog for '%s': %s\n"), |
944 | opts->new_orphan_branch, err.buf); | |
945 | strbuf_release(&err); | |
341fb286 | 946 | free(refname); |
3631bf77 EM |
947 | return; |
948 | } | |
abd0cd3a | 949 | strbuf_release(&err); |
3631bf77 | 950 | } |
341fb286 | 951 | free(refname); |
3631bf77 EM |
952 | } |
953 | else | |
4edce172 NTND |
954 | create_branch(the_repository, |
955 | opts->new_branch, new_branch_info->name, | |
02ac9837 | 956 | opts->new_branch_force ? 1 : 0, |
39bd6f72 | 957 | opts->new_branch_force ? 1 : 0, |
e2bbd0cc | 958 | opts->new_branch_log, |
f9a482e6 | 959 | opts->quiet, |
3f3e7608 GC |
960 | opts->track, |
961 | 0); | |
9081a421 ÆAB |
962 | free(new_branch_info->name); |
963 | free(new_branch_info->refname); | |
964 | new_branch_info->name = xstrdup(opts->new_branch); | |
c8a3ea1f | 965 | setup_branch_path(new_branch_info); |
782c2d65 DB |
966 | } |
967 | ||
c8a3ea1f BW |
968 | old_desc = old_branch_info->name; |
969 | if (!old_desc && old_branch_info->commit) | |
970 | old_desc = oid_to_hex(&old_branch_info->commit->object.oid); | |
3bed291a RR |
971 | |
972 | reflog_msg = getenv("GIT_REFLOG_ACTION"); | |
973 | if (!reflog_msg) | |
974 | strbuf_addf(&msg, "checkout: moving from %s to %s", | |
c8a3ea1f | 975 | old_desc ? old_desc : "(invalid)", new_branch_info->name); |
3bed291a | 976 | else |
a91cc7fa | 977 | strbuf_insertstr(&msg, 0, reflog_msg); |
782c2d65 | 978 | |
c8a3ea1f | 979 | if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) { |
f8bd36a4 | 980 | /* Nothing to do. */ |
c8a3ea1f BW |
981 | } else if (opts->force_detach || !new_branch_info->path) { /* No longer on any branch. */ |
982 | update_ref(msg.buf, "HEAD", &new_branch_info->commit->object.oid, NULL, | |
91774afc | 983 | REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); |
f8bd36a4 | 984 | if (!opts->quiet) { |
c8a3ea1f | 985 | if (old_branch_info->path && |
ed9bff08 | 986 | advice_enabled(ADVICE_DETACHED_HEAD) && !opts->force_detach) |
c8a3ea1f BW |
987 | detach_advice(new_branch_info->name); |
988 | describe_detached_head(_("HEAD is now at"), new_branch_info->commit); | |
f8bd36a4 | 989 | } |
c8a3ea1f BW |
990 | } else if (new_branch_info->path) { /* Switch branches. */ |
991 | if (create_symref("HEAD", new_branch_info->path, msg.buf) < 0) | |
4636f651 | 992 | die(_("unable to update HEAD")); |
782c2d65 | 993 | if (!opts->quiet) { |
c8a3ea1f | 994 | if (old_branch_info->path && !strcmp(new_branch_info->path, old_branch_info->path)) { |
39bd6f72 JN |
995 | if (opts->new_branch_force) |
996 | fprintf(stderr, _("Reset branch '%s'\n"), | |
c8a3ea1f | 997 | new_branch_info->name); |
39bd6f72 JN |
998 | else |
999 | fprintf(stderr, _("Already on '%s'\n"), | |
c8a3ea1f | 1000 | new_branch_info->name); |
08eaa4be ÆAB |
1001 | } else if (opts->new_branch) { |
1002 | if (opts->branch_exists) | |
c8a3ea1f | 1003 | fprintf(stderr, _("Switched to and reset branch '%s'\n"), new_branch_info->name); |
08eaa4be | 1004 | else |
c8a3ea1f | 1005 | fprintf(stderr, _("Switched to a new branch '%s'\n"), new_branch_info->name); |
08eaa4be | 1006 | } else { |
e8a8a4d7 | 1007 | fprintf(stderr, _("Switched to branch '%s'\n"), |
c8a3ea1f | 1008 | new_branch_info->name); |
08eaa4be | 1009 | } |
782c2d65 | 1010 | } |
c8a3ea1f BW |
1011 | if (old_branch_info->path && old_branch_info->name) { |
1012 | if (!ref_exists(old_branch_info->path) && reflog_exists(old_branch_info->path)) | |
1013 | delete_reflog(old_branch_info->path); | |
3631bf77 | 1014 | } |
782c2d65 | 1015 | } |
f4a4b9ac | 1016 | remove_branch_state(the_repository, !opts->quiet); |
782c2d65 | 1017 | strbuf_release(&msg); |
32669671 | 1018 | if (!opts->quiet && |
c8a3ea1f BW |
1019 | (new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) |
1020 | report_tracking(new_branch_info); | |
782c2d65 DB |
1021 | } |
1022 | ||
468224e5 | 1023 | static int add_pending_uninteresting_ref(const char *refname, |
fcb615f5 | 1024 | const struct object_id *oid, |
5cf88fd8 | 1025 | int flags UNUSED, void *cb_data) |
8e2dc6ac | 1026 | { |
a58a1b01 | 1027 | add_pending_oid(cb_data, refname, oid, UNINTERESTING); |
5c08dc48 JK |
1028 | return 0; |
1029 | } | |
8e2dc6ac JH |
1030 | |
1031 | static void describe_one_orphan(struct strbuf *sb, struct commit *commit) | |
1032 | { | |
0be240cc | 1033 | strbuf_addstr(sb, " "); |
30e677e0 | 1034 | strbuf_add_unique_abbrev(sb, &commit->object.oid, DEFAULT_ABBREV); |
0be240cc | 1035 | strbuf_addch(sb, ' '); |
ecb5091f | 1036 | if (!repo_parse_commit(the_repository, commit)) |
3c621839 | 1037 | pp_commit_easy(CMIT_FMT_ONELINE, commit, sb); |
8e2dc6ac JH |
1038 | strbuf_addch(sb, '\n'); |
1039 | } | |
1040 | ||
1041 | #define ORPHAN_CUTOFF 4 | |
1042 | static void suggest_reattach(struct commit *commit, struct rev_info *revs) | |
1043 | { | |
1044 | struct commit *c, *last = NULL; | |
1045 | struct strbuf sb = STRBUF_INIT; | |
1046 | int lost = 0; | |
1047 | while ((c = get_revision(revs)) != NULL) { | |
1048 | if (lost < ORPHAN_CUTOFF) | |
1049 | describe_one_orphan(&sb, c); | |
1050 | last = c; | |
1051 | lost++; | |
1052 | } | |
1053 | if (ORPHAN_CUTOFF < lost) { | |
1054 | int more = lost - ORPHAN_CUTOFF; | |
1055 | if (more == 1) | |
1056 | describe_one_orphan(&sb, last); | |
1057 | else | |
f06f08b7 | 1058 | strbuf_addf(&sb, _(" ... and %d more.\n"), more); |
8e2dc6ac JH |
1059 | } |
1060 | ||
1061 | fprintf(stderr, | |
f06f08b7 ÆAB |
1062 | Q_( |
1063 | /* The singular version */ | |
1064 | "Warning: you are leaving %d commit behind, " | |
1065 | "not connected to\n" | |
1066 | "any of your branches:\n\n" | |
0faf2474 | 1067 | "%s\n", |
f06f08b7 ÆAB |
1068 | /* The plural version */ |
1069 | "Warning: you are leaving %d commits behind, " | |
8e2dc6ac JH |
1070 | "not connected to\n" |
1071 | "any of your branches:\n\n" | |
f807b3dc | 1072 | "%s\n", |
f06f08b7 ÆAB |
1073 | /* Give ngettext() the count */ |
1074 | lost), | |
1075 | lost, | |
f807b3dc | 1076 | sb.buf); |
8e2dc6ac | 1077 | strbuf_release(&sb); |
f807b3dc | 1078 | |
ed9bff08 | 1079 | if (advice_enabled(ADVICE_DETACHED_HEAD)) |
f807b3dc | 1080 | fprintf(stderr, |
fc792ca8 TS |
1081 | Q_( |
1082 | /* The singular version */ | |
1083 | "If you want to keep it by creating a new branch, " | |
1084 | "this may be a good time\nto do so with:\n\n" | |
1085 | " git branch <new-branch-name> %s\n\n", | |
1086 | /* The plural version */ | |
f807b3dc JH |
1087 | "If you want to keep them by creating a new branch, " |
1088 | "this may be a good time\nto do so with:\n\n" | |
fc792ca8 TS |
1089 | " git branch <new-branch-name> %s\n\n", |
1090 | /* Give ngettext() the count */ | |
1091 | lost), | |
d850b7a5 | 1092 | repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV)); |
8e2dc6ac JH |
1093 | } |
1094 | ||
1095 | /* | |
1096 | * We are about to leave commit that was at the tip of a detached | |
1097 | * HEAD. If it is not reachable from any ref, this is the last chance | |
1098 | * for the user to do so without resorting to reflog. | |
1099 | */ | |
c8a3ea1f | 1100 | static void orphaned_commit_warning(struct commit *old_commit, struct commit *new_commit) |
8e2dc6ac | 1101 | { |
8e2dc6ac | 1102 | struct rev_info revs; |
c8a3ea1f | 1103 | struct object *object = &old_commit->object; |
8e2dc6ac | 1104 | |
2abf3503 | 1105 | repo_init_revisions(the_repository, &revs, NULL); |
468224e5 RS |
1106 | setup_revisions(0, NULL, &revs, NULL); |
1107 | ||
1108 | object->flags &= ~UNINTERESTING; | |
f2fd0760 | 1109 | add_pending_object(&revs, object, oid_to_hex(&object->oid)); |
468224e5 | 1110 | |
fcb615f5 | 1111 | for_each_ref(add_pending_uninteresting_ref, &revs); |
1806c29f NTND |
1112 | if (new_commit) |
1113 | add_pending_oid(&revs, "HEAD", | |
1114 | &new_commit->object.oid, | |
1115 | UNINTERESTING); | |
468224e5 | 1116 | |
8e2dc6ac | 1117 | if (prepare_revision_walk(&revs)) |
6c80cd29 | 1118 | die(_("internal error in revision walk")); |
c8a3ea1f BW |
1119 | if (!(old_commit->object.flags & UNINTERESTING)) |
1120 | suggest_reattach(old_commit, &revs); | |
8e2dc6ac | 1121 | else |
c8a3ea1f | 1122 | describe_detached_head(_("Previous HEAD position was"), old_commit); |
5c08dc48 | 1123 | |
b2ccdf7f | 1124 | /* Clean up objects used, as they will be reused. */ |
cd888845 | 1125 | repo_clear_commit_marks(the_repository, ALL_REV_FLAGS); |
2108fe4a | 1126 | release_revisions(&revs); |
8e2dc6ac JH |
1127 | } |
1128 | ||
e51e3057 | 1129 | static int switch_branches(const struct checkout_opts *opts, |
c8a3ea1f | 1130 | struct branch_info *new_branch_info) |
782c2d65 DB |
1131 | { |
1132 | int ret = 0; | |
9081a421 | 1133 | struct branch_info old_branch_info = { 0 }; |
60af7691 | 1134 | struct object_id rev; |
a2b4994c | 1135 | int flag, writeout_error = 0; |
65f099b3 | 1136 | int do_merge = 1; |
e27dd8ae JH |
1137 | |
1138 | trace2_cmd_mode("branch"); | |
1139 | ||
c8a3ea1f | 1140 | memset(&old_branch_info, 0, sizeof(old_branch_info)); |
9081a421 | 1141 | old_branch_info.path = resolve_refdup("HEAD", 0, &rev, &flag); |
c8a3ea1f | 1142 | if (old_branch_info.path) |
21e1ee8f | 1143 | old_branch_info.commit = lookup_commit_reference_gently(the_repository, &rev, 1); |
96ec7b1e | 1144 | if (!(flag & REF_ISSYMREF)) |
9081a421 | 1145 | FREE_AND_NULL(old_branch_info.path); |
782c2d65 | 1146 | |
9081a421 ÆAB |
1147 | if (old_branch_info.path) { |
1148 | const char *const prefix = "refs/heads/"; | |
1149 | const char *p; | |
1150 | if (skip_prefix(old_branch_info.path, prefix, &p)) | |
1151 | old_branch_info.name = xstrdup(p); | |
9081a421 | 1152 | } |
782c2d65 | 1153 | |
1806c29f NTND |
1154 | if (opts->new_orphan_branch && opts->orphan_from_empty_tree) { |
1155 | if (new_branch_info->name) | |
1156 | BUG("'switch --orphan' should never accept a commit as starting point"); | |
1157 | new_branch_info->commit = NULL; | |
9081a421 | 1158 | new_branch_info->name = xstrdup("(empty)"); |
1806c29f NTND |
1159 | do_merge = 1; |
1160 | } | |
1161 | ||
c8a3ea1f | 1162 | if (!new_branch_info->name) { |
9081a421 | 1163 | new_branch_info->name = xstrdup("HEAD"); |
c8a3ea1f BW |
1164 | new_branch_info->commit = old_branch_info.commit; |
1165 | if (!new_branch_info->commit) | |
e8a8a4d7 | 1166 | die(_("You are on a branch yet to be born")); |
c8a3ea1f | 1167 | parse_commit_or_die(new_branch_info->commit); |
65f099b3 NTND |
1168 | |
1169 | if (opts->only_merge_on_switching_branches) | |
1170 | do_merge = 0; | |
782c2d65 DB |
1171 | } |
1172 | ||
65f099b3 | 1173 | if (do_merge) { |
fa655d84 BP |
1174 | ret = merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error); |
1175 | if (ret) { | |
9081a421 | 1176 | branch_info_release(&old_branch_info); |
fa655d84 BP |
1177 | return ret; |
1178 | } | |
96ec7b1e | 1179 | } |
782c2d65 | 1180 | |
c8a3ea1f BW |
1181 | if (!opts->quiet && !old_branch_info.path && old_branch_info.commit && new_branch_info->commit != old_branch_info.commit) |
1182 | orphaned_commit_warning(old_branch_info.commit, new_branch_info->commit); | |
77ebd56d | 1183 | |
c8a3ea1f | 1184 | update_refs_for_switch(opts, &old_branch_info, new_branch_info); |
782c2d65 | 1185 | |
c8a3ea1f | 1186 | ret = post_checkout_hook(old_branch_info.commit, new_branch_info->commit, 1); |
9081a421 ÆAB |
1187 | branch_info_release(&old_branch_info); |
1188 | ||
a2b4994c | 1189 | return ret || writeout_error; |
782c2d65 DB |
1190 | } |
1191 | ||
a4e7e317 GC |
1192 | static int git_checkout_config(const char *var, const char *value, |
1193 | const struct config_context *ctx, void *cb) | |
0cf8581e | 1194 | { |
64f1f58f DL |
1195 | struct checkout_opts *opts = cb; |
1196 | ||
175f6e59 | 1197 | if (!strcmp(var, "diff.ignoresubmodules")) { |
175f6e59 JS |
1198 | handle_ignore_submodules_arg(&opts->diff_options, value); |
1199 | return 0; | |
1200 | } | |
64f1f58f DL |
1201 | if (!strcmp(var, "checkout.guess")) { |
1202 | opts->dwim_new_local_branch = git_config_bool(var, value); | |
1203 | return 0; | |
1204 | } | |
23b4c7bc | 1205 | |
59556548 | 1206 | if (starts_with(var, "submodule.")) |
7463e2ec | 1207 | return git_default_submodule_config(var, value, NULL); |
23b4c7bc | 1208 | |
a4e7e317 | 1209 | return git_xmerge_config(var, value, ctx, NULL); |
0cf8581e JH |
1210 | } |
1211 | ||
7ab4ad00 NTND |
1212 | static void setup_new_branch_info_and_source_tree( |
1213 | struct branch_info *new_branch_info, | |
1214 | struct checkout_opts *opts, | |
1215 | struct object_id *rev, | |
1216 | const char *arg) | |
1217 | { | |
1218 | struct tree **source_tree = &opts->source_tree; | |
1219 | struct object_id branch_rev; | |
1220 | ||
9081a421 | 1221 | new_branch_info->name = xstrdup(arg); |
7ab4ad00 NTND |
1222 | setup_branch_path(new_branch_info); |
1223 | ||
1224 | if (!check_refname_format(new_branch_info->path, 0) && | |
1225 | !read_ref(new_branch_info->path, &branch_rev)) | |
1226 | oidcpy(rev, &branch_rev); | |
9081a421 ÆAB |
1227 | else |
1228 | /* not an existing branch */ | |
1229 | FREE_AND_NULL(new_branch_info->path); | |
7ab4ad00 NTND |
1230 | |
1231 | new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1); | |
1232 | if (!new_branch_info->commit) { | |
1233 | /* not a commit */ | |
1234 | *source_tree = parse_tree_indirect(rev); | |
1235 | } else { | |
1236 | parse_commit_or_die(new_branch_info->commit); | |
ecb5091f ÆAB |
1237 | *source_tree = repo_get_commit_tree(the_repository, |
1238 | new_branch_info->commit); | |
7ab4ad00 NTND |
1239 | } |
1240 | } | |
1241 | ||
2957709b AM |
1242 | static const char *parse_remote_branch(const char *arg, |
1243 | struct object_id *rev, | |
fa74180d | 1244 | int could_be_checkout_paths) |
2957709b | 1245 | { |
fa74180d AM |
1246 | int num_matches = 0; |
1247 | const char *remote = unique_tracking_name(arg, rev, &num_matches); | |
2957709b AM |
1248 | |
1249 | if (remote && could_be_checkout_paths) { | |
1250 | die(_("'%s' could be both a local file and a tracking branch.\n" | |
1251 | "Please use -- (and optionally --no-guess) to disambiguate"), | |
1252 | arg); | |
1253 | } | |
1254 | ||
fa74180d | 1255 | if (!remote && num_matches > 1) { |
ed9bff08 | 1256 | if (advice_enabled(ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME)) { |
fa74180d AM |
1257 | advise(_("If you meant to check out a remote tracking branch on, e.g. 'origin',\n" |
1258 | "you can do so by fully qualifying the name with the --track option:\n" | |
1259 | "\n" | |
1260 | " git checkout --track origin/<name>\n" | |
1261 | "\n" | |
1262 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
1263 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
1264 | "checkout.defaultRemote=origin in your config.")); | |
1265 | } | |
1266 | ||
1267 | die(_("'%s' matched multiple (%d) remote tracking branches"), | |
1268 | arg, num_matches); | |
1269 | } | |
1270 | ||
2957709b AM |
1271 | return remote; |
1272 | } | |
1273 | ||
09ebad6f JN |
1274 | static int parse_branchname_arg(int argc, const char **argv, |
1275 | int dwim_new_local_branch_ok, | |
c8a3ea1f | 1276 | struct branch_info *new_branch_info, |
10f102be | 1277 | struct checkout_opts *opts, |
fa74180d | 1278 | struct object_id *rev) |
09ebad6f | 1279 | { |
10f102be | 1280 | const char **new_branch = &opts->new_branch; |
09ebad6f | 1281 | int argcount = 0; |
09ebad6f | 1282 | const char *arg; |
bca39695 MM |
1283 | int dash_dash_pos; |
1284 | int has_dash_dash = 0; | |
1285 | int i; | |
09ebad6f JN |
1286 | |
1287 | /* | |
1288 | * case 1: git checkout <ref> -- [<paths>] | |
1289 | * | |
1290 | * <ref> must be a valid tree, everything after the '--' must be | |
1291 | * a path. | |
1292 | * | |
1293 | * case 2: git checkout -- [<paths>] | |
1294 | * | |
1295 | * everything after the '--' must be paths. | |
1296 | * | |
a047fafc | 1297 | * case 3: git checkout <something> [--] |
09ebad6f | 1298 | * |
a047fafc MM |
1299 | * (a) If <something> is a commit, that is to |
1300 | * switch to the branch or detach HEAD at it. As a special case, | |
1301 | * if <something> is A...B (missing A or B means HEAD but you can | |
1302 | * omit at most one side), and if there is a unique merge base | |
1303 | * between A and B, A...B names that merge base. | |
09ebad6f | 1304 | * |
a047fafc | 1305 | * (b) If <something> is _not_ a commit, either "--" is present |
b39a8418 | 1306 | * or <something> is not a path, no -t or -b was given, |
a047fafc | 1307 | * and there is a tracking branch whose name is <something> |
8d7b558b ÆAB |
1308 | * in one and only one remote (or if the branch exists on the |
1309 | * remote named in checkout.defaultRemote), then this is a | |
1310 | * short-hand to fork local <something> from that | |
1311 | * remote-tracking branch. | |
09ebad6f | 1312 | * |
a047fafc MM |
1313 | * (c) Otherwise, if "--" is present, treat it like case (1). |
1314 | * | |
1315 | * (d) Otherwise : | |
1316 | * - if it's a reference, treat it like case (1) | |
1317 | * - else if it's a path, treat it like case (2) | |
1318 | * - else: fail. | |
1319 | * | |
1320 | * case 4: git checkout <something> <paths> | |
1321 | * | |
1322 | * The first argument must not be ambiguous. | |
09ebad6f JN |
1323 | * - If it's *only* a reference, treat it like case (1). |
1324 | * - If it's only a path, treat it like case (2). | |
1325 | * - else: fail. | |
1326 | * | |
1327 | */ | |
1328 | if (!argc) | |
1329 | return 0; | |
1330 | ||
5c06e269 NTND |
1331 | if (!opts->accept_pathspec) { |
1332 | if (argc > 1) | |
1333 | die(_("only one reference expected")); | |
1334 | has_dash_dash = 1; /* helps disambiguate */ | |
1335 | } | |
1336 | ||
09ebad6f | 1337 | arg = argv[0]; |
bca39695 MM |
1338 | dash_dash_pos = -1; |
1339 | for (i = 0; i < argc; i++) { | |
5c06e269 | 1340 | if (opts->accept_pathspec && !strcmp(argv[i], "--")) { |
bca39695 MM |
1341 | dash_dash_pos = i; |
1342 | break; | |
1343 | } | |
1344 | } | |
1345 | if (dash_dash_pos == 0) | |
1346 | return 1; /* case (2) */ | |
1347 | else if (dash_dash_pos == 1) | |
1348 | has_dash_dash = 1; /* case (3) or (1) */ | |
1349 | else if (dash_dash_pos >= 2) | |
1350 | die(_("only one reference expected, %d given."), dash_dash_pos); | |
0f086e6d | 1351 | opts->count_checkout_paths = !opts->quiet && !has_dash_dash; |
09ebad6f JN |
1352 | |
1353 | if (!strcmp(arg, "-")) | |
1354 | arg = "@{-1}"; | |
1355 | ||
d850b7a5 | 1356 | if (repo_get_oid_mb(the_repository, arg, rev)) { |
a047fafc MM |
1357 | /* |
1358 | * Either case (3) or (4), with <something> not being | |
1359 | * a commit, or an attempt to use case (1) with an | |
1360 | * invalid ref. | |
1361 | * | |
1362 | * It's likely an error, but we need to find out if | |
1363 | * we should auto-create the branch, case (3).(b). | |
1364 | */ | |
1365 | int recover_with_dwim = dwim_new_local_branch_ok; | |
1366 | ||
be4908f1 NTND |
1367 | int could_be_checkout_paths = !has_dash_dash && |
1368 | check_filename(opts->prefix, arg); | |
1369 | ||
1370 | if (!has_dash_dash && !no_wildcard(arg)) | |
a047fafc | 1371 | recover_with_dwim = 0; |
be4908f1 | 1372 | |
a047fafc | 1373 | /* |
5c06e269 NTND |
1374 | * Accept "git checkout foo", "git checkout foo --" |
1375 | * and "git switch foo" as candidates for dwim. | |
a047fafc MM |
1376 | */ |
1377 | if (!(argc == 1 && !has_dash_dash) && | |
5c06e269 NTND |
1378 | !(argc == 2 && has_dash_dash) && |
1379 | opts->accept_pathspec) | |
a047fafc MM |
1380 | recover_with_dwim = 0; |
1381 | ||
1382 | if (recover_with_dwim) { | |
2957709b | 1383 | const char *remote = parse_remote_branch(arg, rev, |
fa74180d | 1384 | could_be_checkout_paths); |
a047fafc MM |
1385 | if (remote) { |
1386 | *new_branch = arg; | |
1387 | arg = remote; | |
1388 | /* DWIMmed to create local branch, case (3).(b) */ | |
1389 | } else { | |
1390 | recover_with_dwim = 0; | |
1391 | } | |
1392 | } | |
1393 | ||
1394 | if (!recover_with_dwim) { | |
1395 | if (has_dash_dash) | |
1396 | die(_("invalid reference: %s"), arg); | |
09ebad6f JN |
1397 | return argcount; |
1398 | } | |
1399 | } | |
1400 | ||
1401 | /* we can't end up being in (2) anymore, eat the argument */ | |
1402 | argcount++; | |
1403 | argv++; | |
1404 | argc--; | |
1405 | ||
7ab4ad00 | 1406 | setup_new_branch_info_and_source_tree(new_branch_info, opts, rev, arg); |
09ebad6f | 1407 | |
7ab4ad00 | 1408 | if (!opts->source_tree) /* case (1): want a tree */ |
6c80cd29 | 1409 | die(_("reference is not a tree: %s"), arg); |
7ab4ad00 | 1410 | |
7f82b24e | 1411 | if (!has_dash_dash) { /* case (3).(d) -> (1) */ |
09ebad6f JN |
1412 | /* |
1413 | * Do not complain the most common case | |
1414 | * git checkout branch | |
1415 | * even if there happen to be a file called 'branch'; | |
1416 | * it would be extremely annoying. | |
1417 | */ | |
1418 | if (argc) | |
b829b943 | 1419 | verify_non_filename(opts->prefix, arg); |
5c06e269 | 1420 | } else if (opts->accept_pathspec) { |
09ebad6f JN |
1421 | argcount++; |
1422 | argv++; | |
1423 | argc--; | |
1424 | } | |
1425 | ||
1426 | return argcount; | |
1427 | } | |
1428 | ||
a2b4994c | 1429 | static int switch_unborn_to_new_branch(const struct checkout_opts *opts) |
abe19980 JH |
1430 | { |
1431 | int status; | |
1432 | struct strbuf branch_ref = STRBUF_INIT; | |
1433 | ||
e27dd8ae JH |
1434 | trace2_cmd_mode("unborn"); |
1435 | ||
8ced1aa0 CW |
1436 | if (!opts->new_branch) |
1437 | die(_("You are on a branch yet to be born")); | |
abe19980 JH |
1438 | strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch); |
1439 | status = create_symref("HEAD", branch_ref.buf, "checkout -b"); | |
1440 | strbuf_release(&branch_ref); | |
afa8c07a JK |
1441 | if (!opts->quiet) |
1442 | fprintf(stderr, _("Switched to a new branch '%s'\n"), | |
1443 | opts->new_branch); | |
abe19980 JH |
1444 | return status; |
1445 | } | |
1446 | ||
7968bef0 NTND |
1447 | static void die_expecting_a_branch(const struct branch_info *branch_info) |
1448 | { | |
1449 | struct object_id oid; | |
1450 | char *to_free; | |
808213ba | 1451 | int code; |
7968bef0 | 1452 | |
12cb1c10 ÆAB |
1453 | if (repo_dwim_ref(the_repository, branch_info->name, |
1454 | strlen(branch_info->name), &oid, &to_free, 0) == 1) { | |
7968bef0 NTND |
1455 | const char *ref = to_free; |
1456 | ||
1457 | if (skip_prefix(ref, "refs/tags/", &ref)) | |
808213ba AH |
1458 | code = die_message(_("a branch is expected, got tag '%s'"), ref); |
1459 | else if (skip_prefix(ref, "refs/remotes/", &ref)) | |
1460 | code = die_message(_("a branch is expected, got remote branch '%s'"), ref); | |
1461 | else | |
1462 | code = die_message(_("a branch is expected, got '%s'"), ref); | |
7968bef0 | 1463 | } |
808213ba AH |
1464 | else if (branch_info->commit) |
1465 | code = die_message(_("a branch is expected, got commit '%s'"), branch_info->name); | |
1466 | else | |
1467 | /* | |
1468 | * This case should never happen because we already die() on | |
1469 | * non-commit, but just in case. | |
1470 | */ | |
1471 | code = die_message(_("a branch is expected, got '%s'"), branch_info->name); | |
1472 | ||
1473 | if (advice_enabled(ADVICE_SUGGEST_DETACHING_HEAD)) | |
1474 | advise(_("If you want to detach HEAD at the commit, try again with the --detach option.")); | |
1475 | ||
1476 | exit(code); | |
7968bef0 NTND |
1477 | } |
1478 | ||
c45f0f52 NTND |
1479 | static void die_if_some_operation_in_progress(void) |
1480 | { | |
1481 | struct wt_status_state state; | |
1482 | ||
1483 | memset(&state, 0, sizeof(state)); | |
1484 | wt_status_get_state(the_repository, &state, 0); | |
1485 | ||
1486 | if (state.merge_in_progress) | |
1487 | die(_("cannot switch branch while merging\n" | |
1488 | "Consider \"git merge --quit\" " | |
1489 | "or \"git worktree add\".")); | |
1490 | if (state.am_in_progress) | |
1491 | die(_("cannot switch branch in the middle of an am session\n" | |
1492 | "Consider \"git am --quit\" " | |
1493 | "or \"git worktree add\".")); | |
1494 | if (state.rebase_interactive_in_progress || state.rebase_in_progress) | |
1495 | die(_("cannot switch branch while rebasing\n" | |
1496 | "Consider \"git rebase --quit\" " | |
1497 | "or \"git worktree add\".")); | |
1498 | if (state.cherry_pick_in_progress) | |
1499 | die(_("cannot switch branch while cherry-picking\n" | |
1500 | "Consider \"git cherry-pick --quit\" " | |
1501 | "or \"git worktree add\".")); | |
1502 | if (state.revert_in_progress) | |
1503 | die(_("cannot switch branch while reverting\n" | |
1504 | "Consider \"git revert --quit\" " | |
1505 | "or \"git worktree add\".")); | |
1506 | if (state.bisect_in_progress) | |
d16dc428 | 1507 | warning(_("you are switching branch while bisecting")); |
b6046abc ÆAB |
1508 | |
1509 | wt_status_state_free_buffers(&state); | |
c45f0f52 NTND |
1510 | } |
1511 | ||
b6312c27 | 1512 | static int checkout_branch(struct checkout_opts *opts, |
c8a3ea1f | 1513 | struct branch_info *new_branch_info) |
b6312c27 | 1514 | { |
817b345a | 1515 | if (opts->pathspec.nr) |
b6312c27 NTND |
1516 | die(_("paths cannot be used with switching branches")); |
1517 | ||
1518 | if (opts->patch_mode) | |
1519 | die(_("'%s' cannot be used with switching branches"), | |
1520 | "--patch"); | |
1521 | ||
a6cfb9ba | 1522 | if (opts->overlay_mode != -1) |
091e04bc | 1523 | die(_("'%s' cannot be used with switching branches"), |
a6cfb9ba | 1524 | "--[no]-overlay"); |
091e04bc | 1525 | |
b6312c27 NTND |
1526 | if (opts->writeout_stage) |
1527 | die(_("'%s' cannot be used with switching branches"), | |
1528 | "--ours/--theirs"); | |
1529 | ||
1530 | if (opts->force && opts->merge) | |
1531 | die(_("'%s' cannot be used with '%s'"), "-f", "-m"); | |
1532 | ||
3ec37ad1 NTND |
1533 | if (opts->discard_changes && opts->merge) |
1534 | die(_("'%s' cannot be used with '%s'"), "--discard-changes", "--merge"); | |
1535 | ||
b6312c27 NTND |
1536 | if (opts->force_detach && opts->new_branch) |
1537 | die(_("'%s' cannot be used with '%s'"), | |
1538 | "--detach", "-b/-B/--orphan"); | |
1539 | ||
1540 | if (opts->new_orphan_branch) { | |
1541 | if (opts->track != BRANCH_TRACK_UNSPECIFIED) | |
1542 | die(_("'%s' cannot be used with '%s'"), "--orphan", "-t"); | |
1806c29f NTND |
1543 | if (opts->orphan_from_empty_tree && new_branch_info->name) |
1544 | die(_("'%s' cannot take <start-point>"), "--orphan"); | |
b6312c27 NTND |
1545 | } else if (opts->force_detach) { |
1546 | if (opts->track != BRANCH_TRACK_UNSPECIFIED) | |
1547 | die(_("'%s' cannot be used with '%s'"), "--detach", "-t"); | |
1548 | } else if (opts->track == BRANCH_TRACK_UNSPECIFIED) | |
1549 | opts->track = git_branch_track; | |
1550 | ||
c8a3ea1f | 1551 | if (new_branch_info->name && !new_branch_info->commit) |
b6312c27 | 1552 | die(_("Cannot switch branch to a non-commit '%s'"), |
c8a3ea1f | 1553 | new_branch_info->name); |
b6312c27 | 1554 | |
e342c63a NTND |
1555 | if (!opts->switch_branch_doing_nothing_is_ok && |
1556 | !new_branch_info->name && | |
1557 | !opts->new_branch && | |
1558 | !opts->force_detach) | |
1559 | die(_("missing branch or commit argument")); | |
1560 | ||
7968bef0 NTND |
1561 | if (!opts->implicit_detach && |
1562 | !opts->force_detach && | |
1563 | !opts->new_branch && | |
1564 | !opts->new_branch_force && | |
1565 | new_branch_info->name && | |
1566 | !new_branch_info->path) | |
1567 | die_expecting_a_branch(new_branch_info); | |
1568 | ||
c45f0f52 NTND |
1569 | if (!opts->can_switch_when_in_progress) |
1570 | die_if_some_operation_in_progress(); | |
1571 | ||
c8a3ea1f | 1572 | if (new_branch_info->path && !opts->force_detach && !opts->new_branch && |
c265c533 | 1573 | !opts->ignore_other_worktrees) { |
e1c1ab9d | 1574 | int flag; |
efbd4fdf | 1575 | char *head_ref = resolve_refdup("HEAD", 0, NULL, &flag); |
e1c1ab9d | 1576 | if (head_ref && |
c8a3ea1f BW |
1577 | (!(flag & REF_ISSYMREF) || strcmp(head_ref, new_branch_info->path))) |
1578 | die_if_checked_out(new_branch_info->path, 1); | |
e1c1ab9d NTND |
1579 | free(head_ref); |
1580 | } | |
1581 | ||
c8a3ea1f | 1582 | if (!new_branch_info->commit && opts->new_branch) { |
60af7691 | 1583 | struct object_id rev; |
b6312c27 NTND |
1584 | int flag; |
1585 | ||
34c290a6 | 1586 | if (!read_ref_full("HEAD", 0, &rev, &flag) && |
60af7691 | 1587 | (flag & REF_ISSYMREF) && is_null_oid(&rev)) |
b6312c27 NTND |
1588 | return switch_unborn_to_new_branch(opts); |
1589 | } | |
c8a3ea1f | 1590 | return switch_branches(opts, new_branch_info); |
b6312c27 NTND |
1591 | } |
1592 | ||
20871822 NTND |
1593 | static struct option *add_common_options(struct checkout_opts *opts, |
1594 | struct option *prevopts) | |
782c2d65 | 1595 | { |
782c2d65 | 1596 | struct option options[] = { |
b3edccb9 | 1597 | OPT__QUIET(&opts->quiet, N_("suppress progress reporting")), |
203c8533 | 1598 | OPT_CALLBACK_F(0, "recurse-submodules", NULL, |
20871822 | 1599 | "checkout", "control recursive updating of submodules", |
203c8533 | 1600 | PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater), |
20871822 | 1601 | OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")), |
20871822 NTND |
1602 | OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")), |
1603 | OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"), | |
ddfc44a8 | 1604 | N_("conflict style (merge, diff3, or zdiff3)")), |
20871822 NTND |
1605 | OPT_END() |
1606 | }; | |
1607 | struct option *newopts = parse_options_concat(prevopts, options); | |
1608 | free(prevopts); | |
1609 | return newopts; | |
1610 | } | |
1611 | ||
b7b5fce2 NTND |
1612 | static struct option *add_common_switch_branch_options( |
1613 | struct checkout_opts *opts, struct option *prevopts) | |
20871822 NTND |
1614 | { |
1615 | struct option options[] = { | |
163e3b29 | 1616 | OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")), |
6327f0ef | 1617 | OPT_CALLBACK_F('t', "track", &opts->track, "(direct|inherit)", |
15f00281 JS |
1618 | N_("set branch tracking configuration"), |
1619 | PARSE_OPT_OPTARG, | |
d3115660 | 1620 | parse_opt_tracking_mode), |
a5e5f399 NTND |
1621 | OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"), |
1622 | PARSE_OPT_NOCOMPLETE), | |
b3edccb9 | 1623 | OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")), |
20871822 NTND |
1624 | OPT_BOOL_F(0, "overwrite-ignore", &opts->overwrite_ignore, |
1625 | N_("update ignored files (default)"), | |
1626 | PARSE_OPT_NOCOMPLETE), | |
20871822 NTND |
1627 | OPT_BOOL(0, "ignore-other-worktrees", &opts->ignore_other_worktrees, |
1628 | N_("do not check if another worktree is holding the given ref")), | |
1629 | OPT_END() | |
1630 | }; | |
1631 | struct option *newopts = parse_options_concat(prevopts, options); | |
1632 | free(prevopts); | |
1633 | return newopts; | |
1634 | } | |
1635 | ||
1636 | static struct option *add_checkout_path_options(struct checkout_opts *opts, | |
1637 | struct option *prevopts) | |
1638 | { | |
1639 | struct option options[] = { | |
b3edccb9 | 1640 | OPT_SET_INT_F('2', "ours", &opts->writeout_stage, |
3fe735e7 NTND |
1641 | N_("checkout our version for unmerged files"), |
1642 | 2, PARSE_OPT_NONEG), | |
b3edccb9 | 1643 | OPT_SET_INT_F('3', "theirs", &opts->writeout_stage, |
3fe735e7 NTND |
1644 | N_("checkout their version for unmerged files"), |
1645 | 3, PARSE_OPT_NONEG), | |
b3edccb9 NTND |
1646 | OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")), |
1647 | OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree, | |
08d595dc | 1648 | N_("do not limit pathspecs to sparse entries only")), |
a9aecc7a AM |
1649 | OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file), |
1650 | OPT_PATHSPEC_FILE_NUL(&opts->pathspec_file_nul), | |
20871822 | 1651 | OPT_END() |
782c2d65 | 1652 | }; |
20871822 NTND |
1653 | struct option *newopts = parse_options_concat(prevopts, options); |
1654 | free(prevopts); | |
1655 | return newopts; | |
1656 | } | |
1657 | ||
7c16ef75 DL |
1658 | /* create-branch option (either b or c) */ |
1659 | static char cb_option = 'b'; | |
1660 | ||
d787d311 NTND |
1661 | static int checkout_main(int argc, const char **argv, const char *prefix, |
1662 | struct checkout_opts *opts, struct option *options, | |
9081a421 ÆAB |
1663 | const char * const usagestr[], |
1664 | struct branch_info *new_branch_info) | |
20871822 | 1665 | { |
c9c935f6 | 1666 | int parseopt_flags = 0; |
782c2d65 | 1667 | |
b3edccb9 NTND |
1668 | opts->overwrite_ignore = 1; |
1669 | opts->prefix = prefix; | |
1670 | opts->show_progress = -1; | |
782c2d65 | 1671 | |
b3edccb9 | 1672 | git_config(git_checkout_config, opts); |
059fda19 JS |
1673 | if (the_repository->gitdir) { |
1674 | prepare_repo_settings(the_repository); | |
1675 | the_repository->settings.command_requires_full_index = 0; | |
1676 | } | |
1ba5f451 | 1677 | |
b3edccb9 | 1678 | opts->track = BRANCH_TRACK_UNSPECIFIED; |
782c2d65 | 1679 | |
c9c935f6 NTND |
1680 | if (!opts->accept_pathspec && !opts->accept_ref) |
1681 | BUG("make up your mind, you need to take _something_"); | |
1682 | if (opts->accept_pathspec && opts->accept_ref) | |
1683 | parseopt_flags = PARSE_OPT_KEEP_DASHDASH; | |
782c2d65 | 1684 | |
c9c935f6 NTND |
1685 | argc = parse_options(argc, argv, prefix, options, |
1686 | usagestr, parseopt_flags); | |
859fdaba | 1687 | |
b3edccb9 NTND |
1688 | if (opts->show_progress < 0) { |
1689 | if (opts->quiet) | |
1690 | opts->show_progress = 0; | |
870ebdb9 | 1691 | else |
b3edccb9 | 1692 | opts->show_progress = isatty(2); |
870ebdb9 ECA |
1693 | } |
1694 | ||
55cf704a | 1695 | if (opts->conflict_style) { |
a4e7e317 GC |
1696 | struct key_value_info kvi = KVI_INIT; |
1697 | struct config_context ctx = { | |
1698 | .kvi = &kvi, | |
1699 | }; | |
b3edccb9 | 1700 | opts->merge = 1; /* implied */ |
a4e7e317 GC |
1701 | git_xmerge_config("merge.conflictstyle", opts->conflict_style, |
1702 | &ctx, NULL); | |
b6312c27 | 1703 | } |
a5e5f399 | 1704 | if (opts->force) { |
3ec37ad1 | 1705 | opts->discard_changes = 1; |
a5e5f399 NTND |
1706 | opts->ignore_unmerged_opt = "--force"; |
1707 | opts->ignore_unmerged = 1; | |
b6312c27 | 1708 | } |
02ac9837 | 1709 | |
b3edccb9 | 1710 | if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1) |
246cac85 JNA |
1711 | die(_("options '-%c', '-%c', and '%s' cannot be used together"), |
1712 | cb_option, toupper(cb_option), "--orphan"); | |
02ac9837 | 1713 | |
b3edccb9 | 1714 | if (opts->overlay_mode == 1 && opts->patch_mode) |
43ea635c | 1715 | die(_("options '%s' and '%s' cannot be used together"), "-p", "--overlay"); |
091e04bc | 1716 | |
183fb44f NTND |
1717 | if (opts->checkout_index >= 0 || opts->checkout_worktree >= 0) { |
1718 | if (opts->checkout_index < 0) | |
1719 | opts->checkout_index = 0; | |
1720 | if (opts->checkout_worktree < 0) | |
1721 | opts->checkout_worktree = 0; | |
1722 | } else { | |
1723 | if (opts->checkout_index < 0) | |
1724 | opts->checkout_index = -opts->checkout_index - 1; | |
1725 | if (opts->checkout_worktree < 0) | |
1726 | opts->checkout_worktree = -opts->checkout_worktree - 1; | |
1727 | } | |
1728 | if (opts->checkout_index < 0 || opts->checkout_worktree < 0) | |
1729 | BUG("these flags should be non-negative by now"); | |
3a733ce5 | 1730 | /* |
088018e3 ES |
1731 | * convenient shortcut: "git restore --staged [--worktree]" equals |
1732 | * "git restore --staged [--worktree] --source HEAD" | |
3a733ce5 | 1733 | */ |
088018e3 | 1734 | if (!opts->from_treeish && opts->checkout_index) |
3a733ce5 | 1735 | opts->from_treeish = "HEAD"; |
183fb44f | 1736 | |
b6312c27 NTND |
1737 | /* |
1738 | * From here on, new_branch will contain the branch to be checked out, | |
1739 | * and new_branch_force and new_orphan_branch will tell us which one of | |
7c16ef75 | 1740 | * -b/-B/-c/-C/--orphan is being used. |
b6312c27 | 1741 | */ |
b3edccb9 NTND |
1742 | if (opts->new_branch_force) |
1743 | opts->new_branch = opts->new_branch_force; | |
02ac9837 | 1744 | |
b3edccb9 NTND |
1745 | if (opts->new_orphan_branch) |
1746 | opts->new_branch = opts->new_orphan_branch; | |
32669671 | 1747 | |
7c16ef75 | 1748 | /* --track without -c/-C/-b/-B/--orphan should DWIM */ |
b3edccb9 | 1749 | if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) { |
9188ed89 AR |
1750 | const char *argv0 = argv[0]; |
1751 | if (!argc || !strcmp(argv0, "--")) | |
1a07e59c | 1752 | die(_("--track needs a branch name")); |
e3f1da98 RS |
1753 | skip_prefix(argv0, "refs/", &argv0); |
1754 | skip_prefix(argv0, "remotes/", &argv0); | |
9188ed89 AR |
1755 | argv0 = strchr(argv0, '/'); |
1756 | if (!argv0 || !argv0[1]) | |
7c16ef75 | 1757 | die(_("missing branch name; try -%c"), cb_option); |
b3edccb9 | 1758 | opts->new_branch = argv0 + 1; |
bb0ceb62 JS |
1759 | } |
1760 | ||
859fdaba | 1761 | /* |
09ebad6f JN |
1762 | * Extract branch name from command line arguments, so |
1763 | * all that is left is pathspecs. | |
859fdaba | 1764 | * |
09ebad6f | 1765 | * Handle |
70c9ac2f | 1766 | * |
09ebad6f JN |
1767 | * 1) git checkout <tree> -- [<paths>] |
1768 | * 2) git checkout -- [<paths>] | |
1769 | * 3) git checkout <something> [<paths>] | |
859fdaba | 1770 | * |
09ebad6f JN |
1771 | * including "last branch" syntax and DWIM-ery for names of |
1772 | * remote branches, erroring out for invalid or ambiguous cases. | |
859fdaba | 1773 | */ |
c9c935f6 | 1774 | if (argc && opts->accept_ref) { |
60af7691 | 1775 | struct object_id rev; |
09ebad6f | 1776 | int dwim_ok = |
b3edccb9 | 1777 | !opts->patch_mode && |
ccb111b3 | 1778 | opts->dwim_new_local_branch && |
b3edccb9 NTND |
1779 | opts->track == BRANCH_TRACK_UNSPECIFIED && |
1780 | !opts->new_branch; | |
f8bd36a4 | 1781 | int n = parse_branchname_arg(argc, argv, dwim_ok, |
9081a421 | 1782 | new_branch_info, opts, &rev); |
09ebad6f JN |
1783 | argv += n; |
1784 | argc -= n; | |
c9c935f6 NTND |
1785 | } else if (!opts->accept_ref && opts->from_treeish) { |
1786 | struct object_id rev; | |
1787 | ||
d850b7a5 | 1788 | if (repo_get_oid_mb(the_repository, opts->from_treeish, &rev)) |
c9c935f6 NTND |
1789 | die(_("could not resolve %s"), opts->from_treeish); |
1790 | ||
9081a421 | 1791 | setup_new_branch_info_and_source_tree(new_branch_info, |
c9c935f6 NTND |
1792 | opts, &rev, |
1793 | opts->from_treeish); | |
1794 | ||
1795 | if (!opts->source_tree) | |
1796 | die(_("reference is not a tree: %s"), opts->from_treeish); | |
782c2d65 DB |
1797 | } |
1798 | ||
782c2d65 | 1799 | if (argc) { |
b3edccb9 NTND |
1800 | parse_pathspec(&opts->pathspec, 0, |
1801 | opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0, | |
480ca644 | 1802 | prefix, argv); |
301e42ed | 1803 | |
b3edccb9 | 1804 | if (!opts->pathspec.nr) |
e8a8a4d7 | 1805 | die(_("invalid path specification")); |
301e42ed | 1806 | |
b6312c27 NTND |
1807 | /* |
1808 | * Try to give more helpful suggestion. | |
1809 | * new_branch && argc > 1 will be caught later. | |
1810 | */ | |
9081a421 | 1811 | if (opts->new_branch && argc == 1 && !new_branch_info->commit) |
6c486862 | 1812 | die(_("'%s' is not a commit and a branch '%s' cannot be created from it"), |
b3edccb9 | 1813 | argv[0], opts->new_branch); |
782c2d65 | 1814 | |
b3edccb9 | 1815 | if (opts->force_detach) |
b6312c27 NTND |
1816 | die(_("git checkout: --detach does not take a path argument '%s'"), |
1817 | argv[0]); | |
a9aecc7a AM |
1818 | } |
1819 | ||
1820 | if (opts->pathspec_from_file) { | |
1821 | if (opts->pathspec.nr) | |
246cac85 | 1822 | die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file"); |
a9aecc7a AM |
1823 | |
1824 | if (opts->force_detach) | |
12909b6b | 1825 | die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--detach"); |
32669671 | 1826 | |
a9aecc7a | 1827 | if (opts->patch_mode) |
12909b6b | 1828 | die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch"); |
a9aecc7a AM |
1829 | |
1830 | parse_pathspec_file(&opts->pathspec, 0, | |
1831 | 0, | |
1832 | prefix, opts->pathspec_from_file, opts->pathspec_file_nul); | |
1833 | } else if (opts->pathspec_file_nul) { | |
6fa00ee8 | 1834 | die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file"); |
a9aecc7a AM |
1835 | } |
1836 | ||
bfda204a RS |
1837 | opts->pathspec.recursive = 1; |
1838 | ||
a9aecc7a | 1839 | if (opts->pathspec.nr) { |
b3edccb9 | 1840 | if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge) |
b6312c27 NTND |
1841 | die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n" |
1842 | "checking out of the index.")); | |
a9aecc7a AM |
1843 | } else { |
1844 | if (opts->accept_pathspec && !opts->empty_pathspec_ok && | |
1845 | !opts->patch_mode) /* patch mode is special */ | |
1846 | die(_("you must specify path(s) to restore")); | |
782c2d65 DB |
1847 | } |
1848 | ||
b3edccb9 | 1849 | if (opts->new_branch) { |
f285a2d7 | 1850 | struct strbuf buf = STRBUF_INIT; |
55c4a673 | 1851 | |
b3edccb9 NTND |
1852 | if (opts->new_branch_force) |
1853 | opts->branch_exists = validate_branchname(opts->new_branch, &buf); | |
bc1c9c0e | 1854 | else |
b3edccb9 NTND |
1855 | opts->branch_exists = |
1856 | validate_new_branchname(opts->new_branch, &buf, 0); | |
352eadc4 DB |
1857 | strbuf_release(&buf); |
1858 | } | |
1859 | ||
fa74180d | 1860 | if (opts->patch_mode || opts->pathspec.nr) |
9081a421 | 1861 | return checkout_paths(opts, new_branch_info); |
fa74180d | 1862 | else |
9081a421 | 1863 | return checkout_branch(opts, new_branch_info); |
782c2d65 | 1864 | } |
d787d311 NTND |
1865 | |
1866 | int cmd_checkout(int argc, const char **argv, const char *prefix) | |
1867 | { | |
1868 | struct checkout_opts opts; | |
b7b5fce2 NTND |
1869 | struct option *options; |
1870 | struct option checkout_options[] = { | |
1871 | OPT_STRING('b', NULL, &opts.new_branch, N_("branch"), | |
1872 | N_("create and checkout a new branch")), | |
1873 | OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"), | |
1874 | N_("create/reset and checkout a branch")), | |
492ededc | 1875 | OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")), |
ccb111b3 NTND |
1876 | OPT_BOOL(0, "guess", &opts.dwim_new_local_branch, |
1877 | N_("second guess 'git checkout <no-such-branch>' (default)")), | |
a6cfb9ba | 1878 | OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode (default)")), |
b7b5fce2 NTND |
1879 | OPT_END() |
1880 | }; | |
d787d311 | 1881 | int ret; |
9081a421 | 1882 | struct branch_info new_branch_info = { 0 }; |
d787d311 NTND |
1883 | |
1884 | memset(&opts, 0, sizeof(opts)); | |
ccb111b3 | 1885 | opts.dwim_new_local_branch = 1; |
e342c63a | 1886 | opts.switch_branch_doing_nothing_is_ok = 1; |
65f099b3 | 1887 | opts.only_merge_on_switching_branches = 0; |
c9c935f6 | 1888 | opts.accept_ref = 1; |
5c06e269 | 1889 | opts.accept_pathspec = 1; |
7968bef0 | 1890 | opts.implicit_detach = 1; |
c45f0f52 | 1891 | opts.can_switch_when_in_progress = 1; |
1806c29f | 1892 | opts.orphan_from_empty_tree = 0; |
be8ed502 | 1893 | opts.empty_pathspec_ok = 1; |
a6cfb9ba | 1894 | opts.overlay_mode = -1; |
183fb44f NTND |
1895 | opts.checkout_index = -2; /* default on */ |
1896 | opts.checkout_worktree = -2; /* default on */ | |
d787d311 | 1897 | |
31367762 DS |
1898 | if (argc == 3 && !strcmp(argv[1], "-b")) { |
1899 | /* | |
1900 | * User ran 'git checkout -b <branch>' and expects | |
1901 | * the same behavior as 'git switch -c <branch>'. | |
1902 | */ | |
1903 | opts.switch_branch_doing_nothing_is_ok = 0; | |
1904 | opts.only_merge_on_switching_branches = 1; | |
1905 | } | |
1906 | ||
b7b5fce2 | 1907 | options = parse_options_dup(checkout_options); |
d787d311 | 1908 | options = add_common_options(&opts, options); |
b7b5fce2 | 1909 | options = add_common_switch_branch_options(&opts, options); |
d787d311 NTND |
1910 | options = add_checkout_path_options(&opts, options); |
1911 | ||
1912 | ret = checkout_main(argc, argv, prefix, &opts, | |
9081a421 ÆAB |
1913 | options, checkout_usage, &new_branch_info); |
1914 | branch_info_release(&new_branch_info); | |
1915 | clear_pathspec(&opts.pathspec); | |
7ce4088a | 1916 | free(opts.pathspec_from_file); |
d787d311 NTND |
1917 | FREE_AND_NULL(options); |
1918 | return ret; | |
1919 | } | |
1920 | ||
1921 | int cmd_switch(int argc, const char **argv, const char *prefix) | |
1922 | { | |
1923 | struct checkout_opts opts; | |
1924 | struct option *options = NULL; | |
b7b5fce2 NTND |
1925 | struct option switch_options[] = { |
1926 | OPT_STRING('c', "create", &opts.new_branch, N_("branch"), | |
1927 | N_("create and switch to a new branch")), | |
1928 | OPT_STRING('C', "force-create", &opts.new_branch_force, N_("branch"), | |
1929 | N_("create/reset and switch to a branch")), | |
ccb111b3 NTND |
1930 | OPT_BOOL(0, "guess", &opts.dwim_new_local_branch, |
1931 | N_("second guess 'git switch <no-such-branch>'")), | |
3ec37ad1 NTND |
1932 | OPT_BOOL(0, "discard-changes", &opts.discard_changes, |
1933 | N_("throw away local modifications")), | |
b7b5fce2 NTND |
1934 | OPT_END() |
1935 | }; | |
d787d311 | 1936 | int ret; |
9081a421 | 1937 | struct branch_info new_branch_info = { 0 }; |
d787d311 NTND |
1938 | |
1939 | memset(&opts, 0, sizeof(opts)); | |
ccb111b3 | 1940 | opts.dwim_new_local_branch = 1; |
c9c935f6 | 1941 | opts.accept_ref = 1; |
5c06e269 | 1942 | opts.accept_pathspec = 0; |
e342c63a | 1943 | opts.switch_branch_doing_nothing_is_ok = 0; |
65f099b3 | 1944 | opts.only_merge_on_switching_branches = 1; |
7968bef0 | 1945 | opts.implicit_detach = 0; |
c45f0f52 | 1946 | opts.can_switch_when_in_progress = 0; |
1806c29f | 1947 | opts.orphan_from_empty_tree = 1; |
a6cfb9ba | 1948 | opts.overlay_mode = -1; |
d787d311 | 1949 | |
b7b5fce2 | 1950 | options = parse_options_dup(switch_options); |
d787d311 | 1951 | options = add_common_options(&opts, options); |
b7b5fce2 | 1952 | options = add_common_switch_branch_options(&opts, options); |
d787d311 | 1953 | |
7c16ef75 DL |
1954 | cb_option = 'c'; |
1955 | ||
d787d311 | 1956 | ret = checkout_main(argc, argv, prefix, &opts, |
9081a421 ÆAB |
1957 | options, switch_branch_usage, &new_branch_info); |
1958 | branch_info_release(&new_branch_info); | |
d787d311 NTND |
1959 | FREE_AND_NULL(options); |
1960 | return ret; | |
1961 | } | |
46e91b66 NTND |
1962 | |
1963 | int cmd_restore(int argc, const char **argv, const char *prefix) | |
1964 | { | |
1965 | struct checkout_opts opts; | |
c9c935f6 NTND |
1966 | struct option *options; |
1967 | struct option restore_options[] = { | |
1968 | OPT_STRING('s', "source", &opts.from_treeish, "<tree-ish>", | |
182f59da | 1969 | N_("which tree-ish to checkout from")), |
183fb44f NTND |
1970 | OPT_BOOL('S', "staged", &opts.checkout_index, |
1971 | N_("restore the index")), | |
1972 | OPT_BOOL('W', "worktree", &opts.checkout_worktree, | |
1973 | N_("restore the working tree (default)")), | |
a5e5f399 NTND |
1974 | OPT_BOOL(0, "ignore-unmerged", &opts.ignore_unmerged, |
1975 | N_("ignore unmerged entries")), | |
a6cfb9ba | 1976 | OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode")), |
c9c935f6 NTND |
1977 | OPT_END() |
1978 | }; | |
46e91b66 | 1979 | int ret; |
9081a421 | 1980 | struct branch_info new_branch_info = { 0 }; |
46e91b66 NTND |
1981 | |
1982 | memset(&opts, 0, sizeof(opts)); | |
c9c935f6 | 1983 | opts.accept_ref = 0; |
46e91b66 | 1984 | opts.accept_pathspec = 1; |
be8ed502 | 1985 | opts.empty_pathspec_ok = 0; |
a6cfb9ba | 1986 | opts.overlay_mode = 0; |
183fb44f NTND |
1987 | opts.checkout_index = -1; /* default off */ |
1988 | opts.checkout_worktree = -2; /* default on */ | |
a5e5f399 | 1989 | opts.ignore_unmerged_opt = "--ignore-unmerged"; |
46e91b66 | 1990 | |
c9c935f6 | 1991 | options = parse_options_dup(restore_options); |
46e91b66 NTND |
1992 | options = add_common_options(&opts, options); |
1993 | options = add_checkout_path_options(&opts, options); | |
1994 | ||
1995 | ret = checkout_main(argc, argv, prefix, &opts, | |
9081a421 ÆAB |
1996 | options, restore_usage, &new_branch_info); |
1997 | branch_info_release(&new_branch_info); | |
46e91b66 NTND |
1998 | FREE_AND_NULL(options); |
1999 | return ret; | |
2000 | } |