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