1 #define USE_THE_INDEX_COMPATIBILITY_MACROS
6 #include "parse-options.h"
8 #include "object-store.h"
11 #include "tree-walk.h"
12 #include "cache-tree.h"
13 #include "unpack-trees.h"
15 #include "run-command.h"
16 #include "merge-recursive.h"
22 #include "xdiff-interface.h"
24 #include "resolve-undo.h"
25 #include "submodule-config.h"
26 #include "submodule.h"
29 static int checkout_optimize_new_branch
;
31 static const char * const checkout_usage
[] = {
32 N_("git checkout [<options>] <branch>"),
33 N_("git checkout [<options>] [<branch>] -- <file>..."),
37 struct checkout_opts
{
45 int ignore_skipworktree
;
46 int ignore_other_worktrees
;
48 int count_checkout_paths
;
50 * If new checkout options are added, skip_merge_working_tree
51 * should be updated accordingly.
54 const char *new_branch
;
55 const char *new_branch_force
;
56 const char *new_orphan_branch
;
58 enum branch_track track
;
59 struct diff_options diff_options
;
63 struct pathspec pathspec
;
64 struct tree
*source_tree
;
67 static int post_checkout_hook(struct commit
*old_commit
, struct commit
*new_commit
,
70 return run_hook_le(NULL
, "post-checkout",
71 oid_to_hex(old_commit
? &old_commit
->object
.oid
: &null_oid
),
72 oid_to_hex(new_commit
? &new_commit
->object
.oid
: &null_oid
),
73 changed
? "1" : "0", NULL
);
74 /* "new_commit" can be NULL when checking out from the index before
79 static int update_some(const struct object_id
*oid
, struct strbuf
*base
,
80 const char *pathname
, unsigned mode
, int stage
, void *context
)
83 struct cache_entry
*ce
;
87 return READ_TREE_RECURSIVE
;
89 len
= base
->len
+ strlen(pathname
);
90 ce
= make_empty_cache_entry(&the_index
, len
);
91 oidcpy(&ce
->oid
, oid
);
92 memcpy(ce
->name
, base
->buf
, base
->len
);
93 memcpy(ce
->name
+ base
->len
, pathname
, len
- base
->len
);
94 ce
->ce_flags
= create_ce_flags(0) | CE_UPDATE
;
96 ce
->ce_mode
= create_ce_mode(mode
);
99 * If the entry is the same as the current index, we can leave the old
100 * entry in place. Whether it is UPTODATE or not, checkout_entry will
101 * do the right thing.
103 pos
= cache_name_pos(ce
->name
, ce
->ce_namelen
);
105 struct cache_entry
*old
= active_cache
[pos
];
106 if (ce
->ce_mode
== old
->ce_mode
&&
107 oideq(&ce
->oid
, &old
->oid
)) {
108 old
->ce_flags
|= CE_UPDATE
;
109 discard_cache_entry(ce
);
114 add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
118 static int read_tree_some(struct tree
*tree
, const struct pathspec
*pathspec
)
120 read_tree_recursive(the_repository
, tree
, "", 0, 0,
121 pathspec
, update_some
, NULL
);
123 /* update the index with the given tree's info
124 * for all args, expanding wildcards, and exit
125 * with any non-zero return code.
130 static int skip_same_name(const struct cache_entry
*ce
, int pos
)
132 while (++pos
< active_nr
&&
133 !strcmp(active_cache
[pos
]->name
, ce
->name
))
138 static int check_stage(int stage
, const struct cache_entry
*ce
, int pos
)
140 while (pos
< active_nr
&&
141 !strcmp(active_cache
[pos
]->name
, ce
->name
)) {
142 if (ce_stage(active_cache
[pos
]) == stage
)
147 return error(_("path '%s' does not have our version"), ce
->name
);
149 return error(_("path '%s' does not have their version"), ce
->name
);
152 static int check_stages(unsigned stages
, const struct cache_entry
*ce
, int pos
)
155 const char *name
= ce
->name
;
157 while (pos
< active_nr
) {
158 ce
= active_cache
[pos
];
159 if (strcmp(name
, ce
->name
))
161 seen
|= (1 << ce_stage(ce
));
164 if ((stages
& seen
) != stages
)
165 return error(_("path '%s' does not have all necessary versions"),
170 static int checkout_stage(int stage
, const struct cache_entry
*ce
, int pos
,
171 const struct checkout
*state
, int *nr_checkouts
)
173 while (pos
< active_nr
&&
174 !strcmp(active_cache
[pos
]->name
, ce
->name
)) {
175 if (ce_stage(active_cache
[pos
]) == stage
)
176 return checkout_entry(active_cache
[pos
], state
,
181 return error(_("path '%s' does not have our version"), ce
->name
);
183 return error(_("path '%s' does not have their version"), ce
->name
);
186 static int checkout_merged(int pos
, const struct checkout
*state
, int *nr_checkouts
)
188 struct cache_entry
*ce
= active_cache
[pos
];
189 const char *path
= ce
->name
;
190 mmfile_t ancestor
, ours
, theirs
;
192 struct object_id oid
;
193 mmbuffer_t result_buf
;
194 struct object_id threeway
[3];
197 memset(threeway
, 0, sizeof(threeway
));
198 while (pos
< active_nr
) {
200 stage
= ce_stage(ce
);
201 if (!stage
|| strcmp(path
, ce
->name
))
203 oidcpy(&threeway
[stage
- 1], &ce
->oid
);
205 mode
= create_ce_mode(ce
->ce_mode
);
207 ce
= active_cache
[pos
];
209 if (is_null_oid(&threeway
[1]) || is_null_oid(&threeway
[2]))
210 return error(_("path '%s' does not have necessary versions"), path
);
212 read_mmblob(&ancestor
, &threeway
[0]);
213 read_mmblob(&ours
, &threeway
[1]);
214 read_mmblob(&theirs
, &threeway
[2]);
217 * NEEDSWORK: re-create conflicts from merges with
218 * merge.renormalize set, too
220 status
= ll_merge(&result_buf
, path
, &ancestor
, "base",
221 &ours
, "ours", &theirs
, "theirs",
222 state
->istate
, NULL
);
226 if (status
< 0 || !result_buf
.ptr
) {
227 free(result_buf
.ptr
);
228 return error(_("path '%s': cannot merge"), path
);
233 * There is absolutely no reason to write this as a blob object
234 * and create a phony cache entry. This hack is primarily to get
235 * to the write_entry() machinery that massages the contents to
236 * work-tree format and writes out which only allows it for a
237 * cache entry. The code in write_entry() needs to be refactored
238 * to allow us to feed a <buffer, size, mode> instead of a cache
239 * entry. Such a refactoring would help merge_recursive as well
240 * (it also writes the merge result to the object database even
241 * when it may contain conflicts).
243 if (write_object_file(result_buf
.ptr
, result_buf
.size
, blob_type
, &oid
))
244 die(_("Unable to add merge result for '%s'"), path
);
245 free(result_buf
.ptr
);
246 ce
= make_transient_cache_entry(mode
, &oid
, path
, 2);
248 die(_("make_cache_entry failed for path '%s'"), path
);
249 status
= checkout_entry(ce
, state
, NULL
, nr_checkouts
);
250 discard_cache_entry(ce
);
254 static int checkout_paths(const struct checkout_opts
*opts
,
255 const char *revision
)
258 struct checkout state
= CHECKOUT_INIT
;
259 static char *ps_matched
;
260 struct object_id rev
;
263 struct lock_file lock_file
= LOCK_INIT
;
264 int nr_checkouts
= 0, nr_unmerged
= 0;
266 if (opts
->track
!= BRANCH_TRACK_UNSPECIFIED
)
267 die(_("'%s' cannot be used with updating paths"), "--track");
269 if (opts
->new_branch_log
)
270 die(_("'%s' cannot be used with updating paths"), "-l");
272 if (opts
->force
&& opts
->patch_mode
)
273 die(_("'%s' cannot be used with updating paths"), "-f");
275 if (opts
->force_detach
)
276 die(_("'%s' cannot be used with updating paths"), "--detach");
278 if (opts
->merge
&& opts
->patch_mode
)
279 die(_("'%s' cannot be used with %s"), "--merge", "--patch");
281 if (opts
->force
&& opts
->merge
)
282 die(_("'%s' cannot be used with %s"), "-f", "-m");
284 if (opts
->new_branch
)
285 die(_("Cannot update paths and switch to branch '%s' at the same time."),
288 if (opts
->patch_mode
)
289 return run_add_interactive(revision
, "--patch=checkout",
292 repo_hold_locked_index(the_repository
, &lock_file
, LOCK_DIE_ON_ERROR
);
293 if (read_cache_preload(&opts
->pathspec
) < 0)
294 return error(_("index file corrupt"));
296 if (opts
->source_tree
)
297 read_tree_some(opts
->source_tree
, &opts
->pathspec
);
299 ps_matched
= xcalloc(opts
->pathspec
.nr
, 1);
302 * Make sure all pathspecs participated in locating the paths
305 for (pos
= 0; pos
< active_nr
; pos
++) {
306 struct cache_entry
*ce
= active_cache
[pos
];
307 ce
->ce_flags
&= ~CE_MATCHED
;
308 if (!opts
->ignore_skipworktree
&& ce_skip_worktree(ce
))
310 if (opts
->source_tree
&& !(ce
->ce_flags
& CE_UPDATE
))
312 * "git checkout tree-ish -- path", but this entry
313 * is in the original index; it will not be checked
314 * out to the working tree and it does not matter
315 * if pathspec matched this entry. We will not do
316 * anything to this entry at all.
320 * Either this entry came from the tree-ish we are
321 * checking the paths out of, or we are checking out
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
327 * need ps_matched and read_tree_recursive (and
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.
333 if (ce_path_match(&the_index
, ce
, &opts
->pathspec
, ps_matched
))
334 ce
->ce_flags
|= CE_MATCHED
;
337 if (report_path_error(ps_matched
, &opts
->pathspec
, opts
->prefix
)) {
343 /* "checkout -m path" to recreate conflicted state */
345 unmerge_marked_index(&the_index
);
347 /* Any unmerged paths? */
348 for (pos
= 0; pos
< active_nr
; pos
++) {
349 const struct cache_entry
*ce
= active_cache
[pos
];
350 if (ce
->ce_flags
& CE_MATCHED
) {
354 warning(_("path '%s' is unmerged"), ce
->name
);
355 } else if (opts
->writeout_stage
) {
356 errs
|= check_stage(opts
->writeout_stage
, ce
, pos
);
357 } else if (opts
->merge
) {
358 errs
|= check_stages((1<<2) | (1<<3), ce
, pos
);
361 error(_("path '%s' is unmerged"), ce
->name
);
363 pos
= skip_same_name(ce
, pos
) - 1;
369 /* Now we are committed to check them out */
371 state
.refresh_cache
= 1;
372 state
.istate
= &the_index
;
374 enable_delayed_checkout(&state
);
375 for (pos
= 0; pos
< active_nr
; pos
++) {
376 struct cache_entry
*ce
= active_cache
[pos
];
377 if (ce
->ce_flags
& CE_MATCHED
) {
379 errs
|= checkout_entry(ce
, &state
,
380 NULL
, &nr_checkouts
);
383 if (opts
->writeout_stage
)
384 errs
|= checkout_stage(opts
->writeout_stage
,
386 &state
, &nr_checkouts
);
387 else if (opts
->merge
)
388 errs
|= checkout_merged(pos
, &state
,
390 pos
= skip_same_name(ce
, pos
) - 1;
393 errs
|= finish_delayed_checkout(&state
, &nr_checkouts
);
395 if (opts
->count_checkout_paths
) {
397 fprintf_ln(stderr
, Q_("Recreated %d merge conflict",
398 "Recreated %d merge conflicts",
401 if (opts
->source_tree
)
402 fprintf_ln(stderr
, Q_("Updated %d path from %s",
403 "Updated %d paths from %s",
406 find_unique_abbrev(&opts
->source_tree
->object
.oid
,
408 else if (!nr_unmerged
|| nr_checkouts
)
409 fprintf_ln(stderr
, Q_("Updated %d path from the index",
410 "Updated %d paths from the index",
415 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
416 die(_("unable to write new index file"));
418 read_ref_full("HEAD", 0, &rev
, NULL
);
419 head
= lookup_commit_reference_gently(the_repository
, &rev
, 1);
421 errs
|= post_checkout_hook(head
, head
, 0);
425 static void show_local_changes(struct object
*head
,
426 const struct diff_options
*opts
)
429 /* I think we want full paths, even if we're in a subdirectory. */
430 repo_init_revisions(the_repository
, &rev
, NULL
);
431 rev
.diffopt
.flags
= opts
->flags
;
432 rev
.diffopt
.output_format
|= DIFF_FORMAT_NAME_STATUS
;
433 diff_setup_done(&rev
.diffopt
);
434 add_pending_object(&rev
, head
, NULL
);
435 run_diff_index(&rev
, 0);
438 static void describe_detached_head(const char *msg
, struct commit
*commit
)
440 struct strbuf sb
= STRBUF_INIT
;
442 if (!parse_commit(commit
))
443 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &sb
);
444 if (print_sha1_ellipsis()) {
445 fprintf(stderr
, "%s %s... %s\n", msg
,
446 find_unique_abbrev(&commit
->object
.oid
, DEFAULT_ABBREV
), sb
.buf
);
448 fprintf(stderr
, "%s %s %s\n", msg
,
449 find_unique_abbrev(&commit
->object
.oid
, DEFAULT_ABBREV
), sb
.buf
);
454 static int reset_tree(struct tree
*tree
, const struct checkout_opts
*o
,
455 int worktree
, int *writeout_error
)
457 struct unpack_trees_options opts
;
458 struct tree_desc tree_desc
;
460 memset(&opts
, 0, sizeof(opts
));
462 opts
.update
= worktree
;
463 opts
.skip_unmerged
= !worktree
;
466 opts
.fn
= oneway_merge
;
467 opts
.verbose_update
= o
->show_progress
;
468 opts
.src_index
= &the_index
;
469 opts
.dst_index
= &the_index
;
471 init_tree_desc(&tree_desc
, tree
->buffer
, tree
->size
);
472 switch (unpack_trees(1, &tree_desc
, &opts
)) {
476 * We return 0 nevertheless, as the index is all right
477 * and more importantly we have made best efforts to
478 * update paths in the work tree, and we cannot revert
490 const char *name
; /* The short name used */
491 const char *path
; /* The full name of a real branch */
492 struct commit
*commit
; /* The named commit */
494 * if not null the branch is detached because it's already
495 * checked out in this checkout
500 static void setup_branch_path(struct branch_info
*branch
)
502 struct strbuf buf
= STRBUF_INIT
;
504 strbuf_branchname(&buf
, branch
->name
, INTERPRET_BRANCH_LOCAL
);
505 if (strcmp(buf
.buf
, branch
->name
))
506 branch
->name
= xstrdup(buf
.buf
);
507 strbuf_splice(&buf
, 0, 0, "refs/heads/", 11);
508 branch
->path
= strbuf_detach(&buf
, NULL
);
512 * Skip merging the trees, updating the index and working directory if and
513 * only if we are creating a new branch via "git checkout -b <new_branch>."
515 static int skip_merge_working_tree(const struct checkout_opts
*opts
,
516 const struct branch_info
*old_branch_info
,
517 const struct branch_info
*new_branch_info
)
520 * Do the merge if sparse checkout is on and the user has not opted in
521 * to the optimized behavior
523 if (core_apply_sparse_checkout
&& !checkout_optimize_new_branch
)
527 * We must do the merge if we are actually moving to a new commit.
529 if (!old_branch_info
->commit
|| !new_branch_info
->commit
||
530 !oideq(&old_branch_info
->commit
->object
.oid
,
531 &new_branch_info
->commit
->object
.oid
))
535 * opts->patch_mode cannot be used with switching branches so is
540 * opts->quiet only impacts output so doesn't require a merge
544 * Honor the explicit request for a three-way merge or to throw away
547 if (opts
->merge
|| opts
->force
)
551 * --detach is documented as "updating the index and the files in the
552 * working tree" but this optimization skips those steps so fall through
553 * to the regular code path.
555 if (opts
->force_detach
)
559 * opts->writeout_stage cannot be used with switching branches so is
564 * Honor the explicit ignore requests
566 if (!opts
->overwrite_ignore
|| opts
->ignore_skipworktree
||
567 opts
->ignore_other_worktrees
)
571 * opts->show_progress only impacts output so doesn't require a merge
575 * If we aren't creating a new branch any changes or updates will
576 * happen in the existing branch. Since that could only be updating
577 * the index and working directory, we don't want to skip those steps
578 * or we've defeated any purpose in running the command.
580 if (!opts
->new_branch
)
584 * new_branch_force is defined to "create/reset and checkout a branch"
585 * so needs to go through the merge to do the reset
587 if (opts
->new_branch_force
)
591 * A new orphaned branch requrires the index and the working tree to be
592 * adjusted to <start_point>
594 if (opts
->new_orphan_branch
)
598 * Remaining variables are not checkout options but used to track state
602 * Do the merge if this is the initial checkout. We cannot use
603 * is_cache_unborn() here because the index hasn't been loaded yet
604 * so cache_nr and timestamp.sec are always zero.
606 if (!file_exists(get_index_file()))
612 static int merge_working_tree(const struct checkout_opts
*opts
,
613 struct branch_info
*old_branch_info
,
614 struct branch_info
*new_branch_info
,
618 struct lock_file lock_file
= LOCK_INIT
;
620 hold_locked_index(&lock_file
, LOCK_DIE_ON_ERROR
);
621 if (read_cache_preload(NULL
) < 0)
622 return error(_("index file corrupt"));
624 resolve_undo_clear();
626 ret
= reset_tree(get_commit_tree(new_branch_info
->commit
),
627 opts
, 1, writeout_error
);
631 struct tree_desc trees
[2];
633 struct unpack_trees_options topts
;
635 memset(&topts
, 0, sizeof(topts
));
637 topts
.src_index
= &the_index
;
638 topts
.dst_index
= &the_index
;
640 setup_unpack_trees_porcelain(&topts
, "checkout");
642 refresh_cache(REFRESH_QUIET
);
644 if (unmerged_cache()) {
645 error(_("you need to resolve your current index first"));
649 /* 2-way merge to the new branch */
650 topts
.initial_checkout
= is_cache_unborn();
653 topts
.gently
= opts
->merge
&& old_branch_info
->commit
;
654 topts
.verbose_update
= opts
->show_progress
;
655 topts
.fn
= twoway_merge
;
656 if (opts
->overwrite_ignore
) {
657 topts
.dir
= xcalloc(1, sizeof(*topts
.dir
));
658 topts
.dir
->flags
|= DIR_SHOW_IGNORED
;
659 setup_standard_excludes(topts
.dir
);
661 tree
= parse_tree_indirect(old_branch_info
->commit
?
662 &old_branch_info
->commit
->object
.oid
:
663 the_hash_algo
->empty_tree
);
664 init_tree_desc(&trees
[0], tree
->buffer
, tree
->size
);
665 tree
= parse_tree_indirect(&new_branch_info
->commit
->object
.oid
);
666 init_tree_desc(&trees
[1], tree
->buffer
, tree
->size
);
668 ret
= unpack_trees(2, trees
, &topts
);
669 clear_unpack_trees_porcelain(&topts
);
672 * Unpack couldn't do a trivial merge; either
673 * give up or do a real merge, depending on
674 * whether the merge flag was used.
678 struct merge_options o
;
683 * Without old_branch_info->commit, the below is the same as
684 * the two-tree unpack we already tried and failed.
686 if (!old_branch_info
->commit
)
689 /* Do more real merge */
692 * We update the index fully, then write the
693 * tree from the index, then merge the new
694 * branch with the current tree, with the old
695 * branch as the base. Then we reset the index
696 * (but not the working tree) to the new
697 * branch, leaving the working tree as the
698 * merged version, but skipping unmerged
699 * entries in the index.
702 add_files_to_cache(NULL
, NULL
, 0);
704 * NEEDSWORK: carrying over local changes
705 * when branches have different end-of-line
706 * normalization (or clean+smudge rules) is
707 * a pain; plumb in an option to set
710 init_merge_options(&o
, the_repository
);
712 work
= write_tree_from_memory(&o
);
714 ret
= reset_tree(get_commit_tree(new_branch_info
->commit
),
719 o
.ancestor
= old_branch_info
->name
;
720 o
.branch1
= new_branch_info
->name
;
722 ret
= merge_trees(&o
,
723 get_commit_tree(new_branch_info
->commit
),
725 get_commit_tree(old_branch_info
->commit
),
729 ret
= reset_tree(get_commit_tree(new_branch_info
->commit
),
732 strbuf_release(&o
.obuf
);
738 if (!active_cache_tree
)
739 active_cache_tree
= cache_tree();
741 if (!cache_tree_fully_valid(active_cache_tree
))
742 cache_tree_update(&the_index
, WRITE_TREE_SILENT
| WRITE_TREE_REPAIR
);
744 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
745 die(_("unable to write new index file"));
747 if (!opts
->force
&& !opts
->quiet
)
748 show_local_changes(&new_branch_info
->commit
->object
, &opts
->diff_options
);
753 static void report_tracking(struct branch_info
*new_branch_info
)
755 struct strbuf sb
= STRBUF_INIT
;
756 struct branch
*branch
= branch_get(new_branch_info
->name
);
758 if (!format_tracking_info(branch
, &sb
, AHEAD_BEHIND_FULL
))
760 fputs(sb
.buf
, stdout
);
764 static void update_refs_for_switch(const struct checkout_opts
*opts
,
765 struct branch_info
*old_branch_info
,
766 struct branch_info
*new_branch_info
)
768 struct strbuf msg
= STRBUF_INIT
;
769 const char *old_desc
, *reflog_msg
;
770 if (opts
->new_branch
) {
771 if (opts
->new_orphan_branch
) {
774 refname
= mkpathdup("refs/heads/%s", opts
->new_orphan_branch
);
775 if (opts
->new_branch_log
&&
776 !should_autocreate_reflog(refname
)) {
778 struct strbuf err
= STRBUF_INIT
;
780 ret
= safe_create_reflog(refname
, 1, &err
);
782 fprintf(stderr
, _("Can not do reflog for '%s': %s\n"),
783 opts
->new_orphan_branch
, err
.buf
);
784 strbuf_release(&err
);
788 strbuf_release(&err
);
793 create_branch(the_repository
,
794 opts
->new_branch
, new_branch_info
->name
,
795 opts
->new_branch_force
? 1 : 0,
796 opts
->new_branch_force
? 1 : 0,
797 opts
->new_branch_log
,
800 new_branch_info
->name
= opts
->new_branch
;
801 setup_branch_path(new_branch_info
);
804 old_desc
= old_branch_info
->name
;
805 if (!old_desc
&& old_branch_info
->commit
)
806 old_desc
= oid_to_hex(&old_branch_info
->commit
->object
.oid
);
808 reflog_msg
= getenv("GIT_REFLOG_ACTION");
810 strbuf_addf(&msg
, "checkout: moving from %s to %s",
811 old_desc
? old_desc
: "(invalid)", new_branch_info
->name
);
813 strbuf_insert(&msg
, 0, reflog_msg
, strlen(reflog_msg
));
815 if (!strcmp(new_branch_info
->name
, "HEAD") && !new_branch_info
->path
&& !opts
->force_detach
) {
817 } else if (opts
->force_detach
|| !new_branch_info
->path
) { /* No longer on any branch. */
818 update_ref(msg
.buf
, "HEAD", &new_branch_info
->commit
->object
.oid
, NULL
,
819 REF_NO_DEREF
, UPDATE_REFS_DIE_ON_ERR
);
821 if (old_branch_info
->path
&&
822 advice_detached_head
&& !opts
->force_detach
)
823 detach_advice(new_branch_info
->name
);
824 describe_detached_head(_("HEAD is now at"), new_branch_info
->commit
);
826 } else if (new_branch_info
->path
) { /* Switch branches. */
827 if (create_symref("HEAD", new_branch_info
->path
, msg
.buf
) < 0)
828 die(_("unable to update HEAD"));
830 if (old_branch_info
->path
&& !strcmp(new_branch_info
->path
, old_branch_info
->path
)) {
831 if (opts
->new_branch_force
)
832 fprintf(stderr
, _("Reset branch '%s'\n"),
833 new_branch_info
->name
);
835 fprintf(stderr
, _("Already on '%s'\n"),
836 new_branch_info
->name
);
837 } else if (opts
->new_branch
) {
838 if (opts
->branch_exists
)
839 fprintf(stderr
, _("Switched to and reset branch '%s'\n"), new_branch_info
->name
);
841 fprintf(stderr
, _("Switched to a new branch '%s'\n"), new_branch_info
->name
);
843 fprintf(stderr
, _("Switched to branch '%s'\n"),
844 new_branch_info
->name
);
847 if (old_branch_info
->path
&& old_branch_info
->name
) {
848 if (!ref_exists(old_branch_info
->path
) && reflog_exists(old_branch_info
->path
))
849 delete_reflog(old_branch_info
->path
);
852 remove_branch_state(the_repository
);
853 strbuf_release(&msg
);
855 (new_branch_info
->path
|| (!opts
->force_detach
&& !strcmp(new_branch_info
->name
, "HEAD"))))
856 report_tracking(new_branch_info
);
859 static int add_pending_uninteresting_ref(const char *refname
,
860 const struct object_id
*oid
,
861 int flags
, void *cb_data
)
863 add_pending_oid(cb_data
, refname
, oid
, UNINTERESTING
);
867 static void describe_one_orphan(struct strbuf
*sb
, struct commit
*commit
)
869 strbuf_addstr(sb
, " ");
870 strbuf_add_unique_abbrev(sb
, &commit
->object
.oid
, DEFAULT_ABBREV
);
871 strbuf_addch(sb
, ' ');
872 if (!parse_commit(commit
))
873 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, sb
);
874 strbuf_addch(sb
, '\n');
877 #define ORPHAN_CUTOFF 4
878 static void suggest_reattach(struct commit
*commit
, struct rev_info
*revs
)
880 struct commit
*c
, *last
= NULL
;
881 struct strbuf sb
= STRBUF_INIT
;
883 while ((c
= get_revision(revs
)) != NULL
) {
884 if (lost
< ORPHAN_CUTOFF
)
885 describe_one_orphan(&sb
, c
);
889 if (ORPHAN_CUTOFF
< lost
) {
890 int more
= lost
- ORPHAN_CUTOFF
;
892 describe_one_orphan(&sb
, last
);
894 strbuf_addf(&sb
, _(" ... and %d more.\n"), more
);
899 /* The singular version */
900 "Warning: you are leaving %d commit behind, "
902 "any of your branches:\n\n"
904 /* The plural version */
905 "Warning: you are leaving %d commits behind, "
907 "any of your branches:\n\n"
909 /* Give ngettext() the count */
915 if (advice_detached_head
)
918 /* The singular version */
919 "If you want to keep it by creating a new branch, "
920 "this may be a good time\nto do so with:\n\n"
921 " git branch <new-branch-name> %s\n\n",
922 /* The plural version */
923 "If you want to keep them by creating a new branch, "
924 "this may be a good time\nto do so with:\n\n"
925 " git branch <new-branch-name> %s\n\n",
926 /* Give ngettext() the count */
928 find_unique_abbrev(&commit
->object
.oid
, DEFAULT_ABBREV
));
932 * We are about to leave commit that was at the tip of a detached
933 * HEAD. If it is not reachable from any ref, this is the last chance
934 * for the user to do so without resorting to reflog.
936 static void orphaned_commit_warning(struct commit
*old_commit
, struct commit
*new_commit
)
938 struct rev_info revs
;
939 struct object
*object
= &old_commit
->object
;
941 repo_init_revisions(the_repository
, &revs
, NULL
);
942 setup_revisions(0, NULL
, &revs
, NULL
);
944 object
->flags
&= ~UNINTERESTING
;
945 add_pending_object(&revs
, object
, oid_to_hex(&object
->oid
));
947 for_each_ref(add_pending_uninteresting_ref
, &revs
);
948 add_pending_oid(&revs
, "HEAD", &new_commit
->object
.oid
, UNINTERESTING
);
950 if (prepare_revision_walk(&revs
))
951 die(_("internal error in revision walk"));
952 if (!(old_commit
->object
.flags
& UNINTERESTING
))
953 suggest_reattach(old_commit
, &revs
);
955 describe_detached_head(_("Previous HEAD position was"), old_commit
);
957 /* Clean up objects used, as they will be reused. */
958 clear_commit_marks_all(ALL_REV_FLAGS
);
961 static int switch_branches(const struct checkout_opts
*opts
,
962 struct branch_info
*new_branch_info
)
965 struct branch_info old_branch_info
;
967 struct object_id rev
;
968 int flag
, writeout_error
= 0;
969 memset(&old_branch_info
, 0, sizeof(old_branch_info
));
970 old_branch_info
.path
= path_to_free
= resolve_refdup("HEAD", 0, &rev
, &flag
);
971 if (old_branch_info
.path
)
972 old_branch_info
.commit
= lookup_commit_reference_gently(the_repository
, &rev
, 1);
973 if (!(flag
& REF_ISSYMREF
))
974 old_branch_info
.path
= NULL
;
976 if (old_branch_info
.path
)
977 skip_prefix(old_branch_info
.path
, "refs/heads/", &old_branch_info
.name
);
979 if (!new_branch_info
->name
) {
980 new_branch_info
->name
= "HEAD";
981 new_branch_info
->commit
= old_branch_info
.commit
;
982 if (!new_branch_info
->commit
)
983 die(_("You are on a branch yet to be born"));
984 parse_commit_or_die(new_branch_info
->commit
);
987 /* optimize the "checkout -b <new_branch> path */
988 if (skip_merge_working_tree(opts
, &old_branch_info
, new_branch_info
)) {
989 if (!checkout_optimize_new_branch
&& !opts
->quiet
) {
990 if (read_cache_preload(NULL
) < 0)
991 return error(_("index file corrupt"));
992 show_local_changes(&new_branch_info
->commit
->object
, &opts
->diff_options
);
995 ret
= merge_working_tree(opts
, &old_branch_info
, new_branch_info
, &writeout_error
);
1002 if (!opts
->quiet
&& !old_branch_info
.path
&& old_branch_info
.commit
&& new_branch_info
->commit
!= old_branch_info
.commit
)
1003 orphaned_commit_warning(old_branch_info
.commit
, new_branch_info
->commit
);
1005 update_refs_for_switch(opts
, &old_branch_info
, new_branch_info
);
1007 ret
= post_checkout_hook(old_branch_info
.commit
, new_branch_info
->commit
, 1);
1009 return ret
|| writeout_error
;
1012 static int git_checkout_config(const char *var
, const char *value
, void *cb
)
1014 if (!strcmp(var
, "checkout.optimizenewbranch")) {
1015 checkout_optimize_new_branch
= git_config_bool(var
, value
);
1019 if (!strcmp(var
, "diff.ignoresubmodules")) {
1020 struct checkout_opts
*opts
= cb
;
1021 handle_ignore_submodules_arg(&opts
->diff_options
, value
);
1025 if (starts_with(var
, "submodule."))
1026 return git_default_submodule_config(var
, value
, NULL
);
1028 return git_xmerge_config(var
, value
, NULL
);
1031 static int parse_branchname_arg(int argc
, const char **argv
,
1032 int dwim_new_local_branch_ok
,
1033 struct branch_info
*new_branch_info
,
1034 struct checkout_opts
*opts
,
1035 struct object_id
*rev
,
1036 int *dwim_remotes_matched
)
1038 struct tree
**source_tree
= &opts
->source_tree
;
1039 const char **new_branch
= &opts
->new_branch
;
1041 struct object_id branch_rev
;
1044 int has_dash_dash
= 0;
1048 * case 1: git checkout <ref> -- [<paths>]
1050 * <ref> must be a valid tree, everything after the '--' must be
1053 * case 2: git checkout -- [<paths>]
1055 * everything after the '--' must be paths.
1057 * case 3: git checkout <something> [--]
1059 * (a) If <something> is a commit, that is to
1060 * switch to the branch or detach HEAD at it. As a special case,
1061 * if <something> is A...B (missing A or B means HEAD but you can
1062 * omit at most one side), and if there is a unique merge base
1063 * between A and B, A...B names that merge base.
1065 * (b) If <something> is _not_ a commit, either "--" is present
1066 * or <something> is not a path, no -t or -b was given, and
1067 * and there is a tracking branch whose name is <something>
1068 * in one and only one remote (or if the branch exists on the
1069 * remote named in checkout.defaultRemote), then this is a
1070 * short-hand to fork local <something> from that
1071 * remote-tracking branch.
1073 * (c) Otherwise, if "--" is present, treat it like case (1).
1076 * - if it's a reference, treat it like case (1)
1077 * - else if it's a path, treat it like case (2)
1080 * case 4: git checkout <something> <paths>
1082 * The first argument must not be ambiguous.
1083 * - If it's *only* a reference, treat it like case (1).
1084 * - If it's only a path, treat it like case (2).
1093 for (i
= 0; i
< argc
; i
++) {
1094 if (!strcmp(argv
[i
], "--")) {
1099 if (dash_dash_pos
== 0)
1100 return 1; /* case (2) */
1101 else if (dash_dash_pos
== 1)
1102 has_dash_dash
= 1; /* case (3) or (1) */
1103 else if (dash_dash_pos
>= 2)
1104 die(_("only one reference expected, %d given."), dash_dash_pos
);
1105 opts
->count_checkout_paths
= !opts
->quiet
&& !has_dash_dash
;
1107 if (!strcmp(arg
, "-"))
1110 if (get_oid_mb(arg
, rev
)) {
1112 * Either case (3) or (4), with <something> not being
1113 * a commit, or an attempt to use case (1) with an
1116 * It's likely an error, but we need to find out if
1117 * we should auto-create the branch, case (3).(b).
1119 int recover_with_dwim
= dwim_new_local_branch_ok
;
1121 int could_be_checkout_paths
= !has_dash_dash
&&
1122 check_filename(opts
->prefix
, arg
);
1124 if (!has_dash_dash
&& !no_wildcard(arg
))
1125 recover_with_dwim
= 0;
1128 * Accept "git checkout foo" and "git checkout foo --"
1129 * as candidates for dwim.
1131 if (!(argc
== 1 && !has_dash_dash
) &&
1132 !(argc
== 2 && has_dash_dash
))
1133 recover_with_dwim
= 0;
1135 if (recover_with_dwim
) {
1136 const char *remote
= unique_tracking_name(arg
, rev
,
1137 dwim_remotes_matched
);
1139 if (could_be_checkout_paths
)
1140 die(_("'%s' could be both a local file and a tracking branch.\n"
1141 "Please use -- (and optionally --no-guess) to disambiguate"),
1145 /* DWIMmed to create local branch, case (3).(b) */
1147 recover_with_dwim
= 0;
1151 if (!recover_with_dwim
) {
1153 die(_("invalid reference: %s"), arg
);
1158 /* we can't end up being in (2) anymore, eat the argument */
1163 new_branch_info
->name
= arg
;
1164 setup_branch_path(new_branch_info
);
1166 if (!check_refname_format(new_branch_info
->path
, 0) &&
1167 !read_ref(new_branch_info
->path
, &branch_rev
))
1168 oidcpy(rev
, &branch_rev
);
1170 new_branch_info
->path
= NULL
; /* not an existing branch */
1172 new_branch_info
->commit
= lookup_commit_reference_gently(the_repository
, rev
, 1);
1173 if (!new_branch_info
->commit
) {
1175 *source_tree
= parse_tree_indirect(rev
);
1177 parse_commit_or_die(new_branch_info
->commit
);
1178 *source_tree
= get_commit_tree(new_branch_info
->commit
);
1181 if (!*source_tree
) /* case (1): want a tree */
1182 die(_("reference is not a tree: %s"), arg
);
1183 if (!has_dash_dash
) { /* case (3).(d) -> (1) */
1185 * Do not complain the most common case
1186 * git checkout branch
1187 * even if there happen to be a file called 'branch';
1188 * it would be extremely annoying.
1191 verify_non_filename(opts
->prefix
, arg
);
1201 static int switch_unborn_to_new_branch(const struct checkout_opts
*opts
)
1204 struct strbuf branch_ref
= STRBUF_INIT
;
1206 if (!opts
->new_branch
)
1207 die(_("You are on a branch yet to be born"));
1208 strbuf_addf(&branch_ref
, "refs/heads/%s", opts
->new_branch
);
1209 status
= create_symref("HEAD", branch_ref
.buf
, "checkout -b");
1210 strbuf_release(&branch_ref
);
1212 fprintf(stderr
, _("Switched to a new branch '%s'\n"),
1217 static int checkout_branch(struct checkout_opts
*opts
,
1218 struct branch_info
*new_branch_info
)
1220 if (opts
->pathspec
.nr
)
1221 die(_("paths cannot be used with switching branches"));
1223 if (opts
->patch_mode
)
1224 die(_("'%s' cannot be used with switching branches"),
1227 if (opts
->writeout_stage
)
1228 die(_("'%s' cannot be used with switching branches"),
1231 if (opts
->force
&& opts
->merge
)
1232 die(_("'%s' cannot be used with '%s'"), "-f", "-m");
1234 if (opts
->force_detach
&& opts
->new_branch
)
1235 die(_("'%s' cannot be used with '%s'"),
1236 "--detach", "-b/-B/--orphan");
1238 if (opts
->new_orphan_branch
) {
1239 if (opts
->track
!= BRANCH_TRACK_UNSPECIFIED
)
1240 die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
1241 } else if (opts
->force_detach
) {
1242 if (opts
->track
!= BRANCH_TRACK_UNSPECIFIED
)
1243 die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
1244 } else if (opts
->track
== BRANCH_TRACK_UNSPECIFIED
)
1245 opts
->track
= git_branch_track
;
1247 if (new_branch_info
->name
&& !new_branch_info
->commit
)
1248 die(_("Cannot switch branch to a non-commit '%s'"),
1249 new_branch_info
->name
);
1251 if (new_branch_info
->path
&& !opts
->force_detach
&& !opts
->new_branch
&&
1252 !opts
->ignore_other_worktrees
) {
1254 char *head_ref
= resolve_refdup("HEAD", 0, NULL
, &flag
);
1256 (!(flag
& REF_ISSYMREF
) || strcmp(head_ref
, new_branch_info
->path
)))
1257 die_if_checked_out(new_branch_info
->path
, 1);
1261 if (!new_branch_info
->commit
&& opts
->new_branch
) {
1262 struct object_id rev
;
1265 if (!read_ref_full("HEAD", 0, &rev
, &flag
) &&
1266 (flag
& REF_ISSYMREF
) && is_null_oid(&rev
))
1267 return switch_unborn_to_new_branch(opts
);
1269 return switch_branches(opts
, new_branch_info
);
1272 int cmd_checkout(int argc
, const char **argv
, const char *prefix
)
1274 struct checkout_opts opts
;
1275 struct branch_info new_branch_info
;
1276 char *conflict_style
= NULL
;
1277 int dwim_new_local_branch
, no_dwim_new_local_branch
= 0;
1278 int dwim_remotes_matched
= 0;
1279 struct option options
[] = {
1280 OPT__QUIET(&opts
.quiet
, N_("suppress progress reporting")),
1281 OPT_STRING('b', NULL
, &opts
.new_branch
, N_("branch"),
1282 N_("create and checkout a new branch")),
1283 OPT_STRING('B', NULL
, &opts
.new_branch_force
, N_("branch"),
1284 N_("create/reset and checkout a branch")),
1285 OPT_BOOL('l', NULL
, &opts
.new_branch_log
, N_("create reflog for new branch")),
1286 OPT_BOOL(0, "detach", &opts
.force_detach
, N_("detach HEAD at named commit")),
1287 OPT_SET_INT('t', "track", &opts
.track
, N_("set upstream info for new branch"),
1288 BRANCH_TRACK_EXPLICIT
),
1289 OPT_STRING(0, "orphan", &opts
.new_orphan_branch
, N_("new-branch"), N_("new unparented branch")),
1290 OPT_SET_INT_F('2', "ours", &opts
.writeout_stage
,
1291 N_("checkout our version for unmerged files"),
1292 2, PARSE_OPT_NONEG
),
1293 OPT_SET_INT_F('3', "theirs", &opts
.writeout_stage
,
1294 N_("checkout their version for unmerged files"),
1295 3, PARSE_OPT_NONEG
),
1296 OPT__FORCE(&opts
.force
, N_("force checkout (throw away local modifications)"),
1297 PARSE_OPT_NOCOMPLETE
),
1298 OPT_BOOL('m', "merge", &opts
.merge
, N_("perform a 3-way merge with the new branch")),
1299 OPT_BOOL_F(0, "overwrite-ignore", &opts
.overwrite_ignore
,
1300 N_("update ignored files (default)"),
1301 PARSE_OPT_NOCOMPLETE
),
1302 OPT_STRING(0, "conflict", &conflict_style
, N_("style"),
1303 N_("conflict style (merge or diff3)")),
1304 OPT_BOOL('p', "patch", &opts
.patch_mode
, N_("select hunks interactively")),
1305 OPT_BOOL(0, "ignore-skip-worktree-bits", &opts
.ignore_skipworktree
,
1306 N_("do not limit pathspecs to sparse entries only")),
1307 OPT_BOOL(0, "no-guess", &no_dwim_new_local_branch
,
1308 N_("do not second guess 'git checkout <no-such-branch>'")),
1309 OPT_BOOL(0, "ignore-other-worktrees", &opts
.ignore_other_worktrees
,
1310 N_("do not check if another worktree is holding the given ref")),
1311 { OPTION_CALLBACK
, 0, "recurse-submodules", NULL
,
1312 "checkout", "control recursive updating of submodules",
1313 PARSE_OPT_OPTARG
, option_parse_recurse_submodules_worktree_updater
},
1314 OPT_BOOL(0, "progress", &opts
.show_progress
, N_("force progress reporting")),
1318 memset(&opts
, 0, sizeof(opts
));
1319 memset(&new_branch_info
, 0, sizeof(new_branch_info
));
1320 opts
.overwrite_ignore
= 1;
1321 opts
.prefix
= prefix
;
1322 opts
.show_progress
= -1;
1324 git_config(git_checkout_config
, &opts
);
1326 opts
.track
= BRANCH_TRACK_UNSPECIFIED
;
1328 argc
= parse_options(argc
, argv
, prefix
, options
, checkout_usage
,
1329 PARSE_OPT_KEEP_DASHDASH
);
1331 dwim_new_local_branch
= !no_dwim_new_local_branch
;
1332 if (opts
.show_progress
< 0) {
1334 opts
.show_progress
= 0;
1336 opts
.show_progress
= isatty(2);
1339 if (conflict_style
) {
1340 opts
.merge
= 1; /* implied */
1341 git_xmerge_config("merge.conflictstyle", conflict_style
, NULL
);
1344 if ((!!opts
.new_branch
+ !!opts
.new_branch_force
+ !!opts
.new_orphan_branch
) > 1)
1345 die(_("-b, -B and --orphan are mutually exclusive"));
1348 * From here on, new_branch will contain the branch to be checked out,
1349 * and new_branch_force and new_orphan_branch will tell us which one of
1350 * -b/-B/--orphan is being used.
1352 if (opts
.new_branch_force
)
1353 opts
.new_branch
= opts
.new_branch_force
;
1355 if (opts
.new_orphan_branch
)
1356 opts
.new_branch
= opts
.new_orphan_branch
;
1358 /* --track without -b/-B/--orphan should DWIM */
1359 if (opts
.track
!= BRANCH_TRACK_UNSPECIFIED
&& !opts
.new_branch
) {
1360 const char *argv0
= argv
[0];
1361 if (!argc
|| !strcmp(argv0
, "--"))
1362 die(_("--track needs a branch name"));
1363 skip_prefix(argv0
, "refs/", &argv0
);
1364 skip_prefix(argv0
, "remotes/", &argv0
);
1365 argv0
= strchr(argv0
, '/');
1366 if (!argv0
|| !argv0
[1])
1367 die(_("missing branch name; try -b"));
1368 opts
.new_branch
= argv0
+ 1;
1372 * Extract branch name from command line arguments, so
1373 * all that is left is pathspecs.
1377 * 1) git checkout <tree> -- [<paths>]
1378 * 2) git checkout -- [<paths>]
1379 * 3) git checkout <something> [<paths>]
1381 * including "last branch" syntax and DWIM-ery for names of
1382 * remote branches, erroring out for invalid or ambiguous cases.
1385 struct object_id rev
;
1388 dwim_new_local_branch
&&
1389 opts
.track
== BRANCH_TRACK_UNSPECIFIED
&&
1391 int n
= parse_branchname_arg(argc
, argv
, dwim_ok
,
1392 &new_branch_info
, &opts
, &rev
,
1393 &dwim_remotes_matched
);
1399 parse_pathspec(&opts
.pathspec
, 0,
1400 opts
.patch_mode
? PATHSPEC_PREFIX_ORIGIN
: 0,
1403 if (!opts
.pathspec
.nr
)
1404 die(_("invalid path specification"));
1407 * Try to give more helpful suggestion.
1408 * new_branch && argc > 1 will be caught later.
1410 if (opts
.new_branch
&& argc
== 1)
1411 die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
1412 argv
[0], opts
.new_branch
);
1414 if (opts
.force_detach
)
1415 die(_("git checkout: --detach does not take a path argument '%s'"),
1418 if (1 < !!opts
.writeout_stage
+ !!opts
.force
+ !!opts
.merge
)
1419 die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1420 "checking out of the index."));
1423 if (opts
.new_branch
) {
1424 struct strbuf buf
= STRBUF_INIT
;
1426 if (opts
.new_branch_force
)
1427 opts
.branch_exists
= validate_branchname(opts
.new_branch
, &buf
);
1429 opts
.branch_exists
=
1430 validate_new_branchname(opts
.new_branch
, &buf
, 0);
1431 strbuf_release(&buf
);
1435 if (opts
.patch_mode
|| opts
.pathspec
.nr
) {
1436 int ret
= checkout_paths(&opts
, new_branch_info
.name
);
1437 if (ret
&& dwim_remotes_matched
> 1 &&
1438 advice_checkout_ambiguous_remote_branch_name
)
1439 advise(_("'%s' matched more than one remote tracking branch.\n"
1440 "We found %d remotes with a reference that matched. So we fell back\n"
1441 "on trying to resolve the argument as a path, but failed there too!\n"
1443 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
1444 "you can do so by fully qualifying the name with the --track option:\n"
1446 " git checkout --track origin/<name>\n"
1448 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
1449 "one remote, e.g. the 'origin' remote, consider setting\n"
1450 "checkout.defaultRemote=origin in your config."),
1452 dwim_remotes_matched
);
1455 return checkout_branch(&opts
, &new_branch_info
);