3 #include "parse-options.h"
8 #include "cache-tree.h"
9 #include "unpack-trees.h"
11 #include "run-command.h"
12 #include "merge-recursive.h"
18 #include "xdiff-interface.h"
20 #include "resolve-undo.h"
21 #include "submodule.h"
22 #include "argv-array.h"
24 static const char * const checkout_usage
[] = {
25 "git checkout [options] <branch>",
26 "git checkout [options] [<branch>] -- <file>...",
30 struct checkout_opts
{
39 const char *new_branch
;
40 const char *new_branch_force
;
41 const char *new_orphan_branch
;
43 enum branch_track track
;
44 struct diff_options diff_options
;
48 const char **pathspec
;
49 struct tree
*source_tree
;
52 static int post_checkout_hook(struct commit
*old
, struct commit
*new,
55 return run_hook(NULL
, "post-checkout",
56 sha1_to_hex(old
? old
->object
.sha1
: null_sha1
),
57 sha1_to_hex(new ? new->object
.sha1
: null_sha1
),
58 changed
? "1" : "0", NULL
);
59 /* "new" can be NULL when checking out from the index before
64 static int update_some(const unsigned char *sha1
, const char *base
, int baselen
,
65 const char *pathname
, unsigned mode
, int stage
, void *context
)
68 struct cache_entry
*ce
;
71 return READ_TREE_RECURSIVE
;
73 len
= baselen
+ strlen(pathname
);
74 ce
= xcalloc(1, cache_entry_size(len
));
75 hashcpy(ce
->sha1
, sha1
);
76 memcpy(ce
->name
, base
, baselen
);
77 memcpy(ce
->name
+ baselen
, pathname
, len
- baselen
);
78 ce
->ce_flags
= create_ce_flags(0) | CE_UPDATE
;
80 ce
->ce_mode
= create_ce_mode(mode
);
81 add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
85 static int read_tree_some(struct tree
*tree
, const char **pathspec
)
88 init_pathspec(&ps
, pathspec
);
89 read_tree_recursive(tree
, "", 0, 0, &ps
, update_some
, NULL
);
92 /* update the index with the given tree's info
93 * for all args, expanding wildcards, and exit
94 * with any non-zero return code.
99 static int skip_same_name(struct cache_entry
*ce
, int pos
)
101 while (++pos
< active_nr
&&
102 !strcmp(active_cache
[pos
]->name
, ce
->name
))
107 static int check_stage(int stage
, struct cache_entry
*ce
, int pos
)
109 while (pos
< active_nr
&&
110 !strcmp(active_cache
[pos
]->name
, ce
->name
)) {
111 if (ce_stage(active_cache
[pos
]) == stage
)
116 return error(_("path '%s' does not have our version"), ce
->name
);
118 return error(_("path '%s' does not have their version"), ce
->name
);
121 static int check_stages(unsigned stages
, struct cache_entry
*ce
, int pos
)
124 const char *name
= ce
->name
;
126 while (pos
< active_nr
) {
127 ce
= active_cache
[pos
];
128 if (strcmp(name
, ce
->name
))
130 seen
|= (1 << ce_stage(ce
));
133 if ((stages
& seen
) != stages
)
134 return error(_("path '%s' does not have all necessary versions"),
139 static int checkout_stage(int stage
, struct cache_entry
*ce
, int pos
,
140 struct checkout
*state
)
142 while (pos
< active_nr
&&
143 !strcmp(active_cache
[pos
]->name
, ce
->name
)) {
144 if (ce_stage(active_cache
[pos
]) == stage
)
145 return checkout_entry(active_cache
[pos
], state
, NULL
);
149 return error(_("path '%s' does not have our version"), ce
->name
);
151 return error(_("path '%s' does not have their version"), ce
->name
);
154 static int checkout_merged(int pos
, struct checkout
*state
)
156 struct cache_entry
*ce
= active_cache
[pos
];
157 const char *path
= ce
->name
;
158 mmfile_t ancestor
, ours
, theirs
;
160 unsigned char sha1
[20];
161 mmbuffer_t result_buf
;
162 unsigned char threeway
[3][20];
165 memset(threeway
, 0, sizeof(threeway
));
166 while (pos
< active_nr
) {
168 stage
= ce_stage(ce
);
169 if (!stage
|| strcmp(path
, ce
->name
))
171 hashcpy(threeway
[stage
- 1], ce
->sha1
);
173 mode
= create_ce_mode(ce
->ce_mode
);
175 ce
= active_cache
[pos
];
177 if (is_null_sha1(threeway
[1]) || is_null_sha1(threeway
[2]))
178 return error(_("path '%s' does not have necessary versions"), path
);
180 read_mmblob(&ancestor
, threeway
[0]);
181 read_mmblob(&ours
, threeway
[1]);
182 read_mmblob(&theirs
, threeway
[2]);
185 * NEEDSWORK: re-create conflicts from merges with
186 * merge.renormalize set, too
188 status
= ll_merge(&result_buf
, path
, &ancestor
, "base",
189 &ours
, "ours", &theirs
, "theirs", NULL
);
193 if (status
< 0 || !result_buf
.ptr
) {
194 free(result_buf
.ptr
);
195 return error(_("path '%s': cannot merge"), path
);
200 * There is absolutely no reason to write this as a blob object
201 * and create a phony cache entry just to leak. This hack is
202 * primarily to get to the write_entry() machinery that massages
203 * the contents to work-tree format and writes out which only
204 * allows it for a cache entry. The code in write_entry() needs
205 * to be refactored to allow us to feed a <buffer, size, mode>
206 * instead of a cache entry. Such a refactoring would help
207 * merge_recursive as well (it also writes the merge result to the
208 * object database even when it may contain conflicts).
210 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
212 die(_("Unable to add merge result for '%s'"), path
);
213 ce
= make_cache_entry(mode
, sha1
, path
, 2, 0);
215 die(_("make_cache_entry failed for path '%s'"), path
);
216 status
= checkout_entry(ce
, state
, NULL
);
220 static int checkout_paths(const struct checkout_opts
*opts
,
221 const char *revision
)
224 struct checkout state
;
225 static char *ps_matched
;
226 unsigned char rev
[20];
230 int stage
= opts
->writeout_stage
;
231 int merge
= opts
->merge
;
233 struct lock_file
*lock_file
;
235 if (opts
->track
!= BRANCH_TRACK_UNSPECIFIED
)
236 die(_("'%s' cannot be used with updating paths"), "--track");
238 if (opts
->new_branch_log
)
239 die(_("'%s' cannot be used with updating paths"), "-l");
241 if (opts
->force
&& opts
->patch_mode
)
242 die(_("'%s' cannot be used with updating paths"), "-f");
244 if (opts
->force_detach
)
245 die(_("'%s' cannot be used with updating paths"), "--detach");
247 if (opts
->merge
&& opts
->patch_mode
)
248 die(_("'%s' cannot be used with %s"), "--merge", "--patch");
250 if (opts
->force
&& opts
->merge
)
251 die(_("'%s' cannot be used with %s"), "-f", "-m");
253 if (opts
->new_branch
)
254 die(_("Cannot update paths and switch to branch '%s' at the same time."),
257 if (opts
->patch_mode
)
258 return run_add_interactive(revision
, "--patch=checkout",
261 lock_file
= xcalloc(1, sizeof(struct lock_file
));
263 newfd
= hold_locked_index(lock_file
, 1);
264 if (read_cache_preload(opts
->pathspec
) < 0)
265 return error(_("corrupt index file"));
267 if (opts
->source_tree
)
268 read_tree_some(opts
->source_tree
, opts
->pathspec
);
270 for (pos
= 0; opts
->pathspec
[pos
]; pos
++)
272 ps_matched
= xcalloc(1, pos
);
274 for (pos
= 0; pos
< active_nr
; pos
++) {
275 struct cache_entry
*ce
= active_cache
[pos
];
276 if (opts
->source_tree
&& !(ce
->ce_flags
& CE_UPDATE
))
278 match_pathspec(opts
->pathspec
, ce
->name
, ce_namelen(ce
), 0, ps_matched
);
281 if (report_path_error(ps_matched
, opts
->pathspec
, opts
->prefix
))
284 /* "checkout -m path" to recreate conflicted state */
286 unmerge_cache(opts
->pathspec
);
288 /* Any unmerged paths? */
289 for (pos
= 0; pos
< active_nr
; pos
++) {
290 struct cache_entry
*ce
= active_cache
[pos
];
291 if (match_pathspec(opts
->pathspec
, ce
->name
, ce_namelen(ce
), 0, NULL
)) {
295 warning(_("path '%s' is unmerged"), ce
->name
);
297 errs
|= check_stage(stage
, ce
, pos
);
298 } else if (opts
->merge
) {
299 errs
|= check_stages((1<<2) | (1<<3), ce
, pos
);
302 error(_("path '%s' is unmerged"), ce
->name
);
304 pos
= skip_same_name(ce
, pos
) - 1;
310 /* Now we are committed to check them out */
311 memset(&state
, 0, sizeof(state
));
313 state
.refresh_cache
= 1;
314 for (pos
= 0; pos
< active_nr
; pos
++) {
315 struct cache_entry
*ce
= active_cache
[pos
];
316 if (opts
->source_tree
&& !(ce
->ce_flags
& CE_UPDATE
))
318 if (match_pathspec(opts
->pathspec
, ce
->name
, ce_namelen(ce
), 0, NULL
)) {
320 errs
|= checkout_entry(ce
, &state
, NULL
);
324 errs
|= checkout_stage(stage
, ce
, pos
, &state
);
326 errs
|= checkout_merged(pos
, &state
);
327 pos
= skip_same_name(ce
, pos
) - 1;
331 if (write_cache(newfd
, active_cache
, active_nr
) ||
332 commit_locked_index(lock_file
))
333 die(_("unable to write new index file"));
335 read_ref_full("HEAD", rev
, 0, &flag
);
336 head
= lookup_commit_reference_gently(rev
, 1);
338 errs
|= post_checkout_hook(head
, head
, 0);
342 static void show_local_changes(struct object
*head
,
343 const struct diff_options
*opts
)
346 /* I think we want full paths, even if we're in a subdirectory. */
347 init_revisions(&rev
, NULL
);
348 rev
.diffopt
.flags
= opts
->flags
;
349 rev
.diffopt
.output_format
|= DIFF_FORMAT_NAME_STATUS
;
350 diff_setup_done(&rev
.diffopt
);
351 add_pending_object(&rev
, head
, NULL
);
352 run_diff_index(&rev
, 0);
355 static void describe_detached_head(const char *msg
, struct commit
*commit
)
357 struct strbuf sb
= STRBUF_INIT
;
358 parse_commit(commit
);
359 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &sb
);
360 fprintf(stderr
, "%s %s... %s\n", msg
,
361 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
), sb
.buf
);
365 static int reset_tree(struct tree
*tree
, const struct checkout_opts
*o
,
366 int worktree
, int *writeout_error
)
368 struct unpack_trees_options opts
;
369 struct tree_desc tree_desc
;
371 memset(&opts
, 0, sizeof(opts
));
373 opts
.update
= worktree
;
374 opts
.skip_unmerged
= !worktree
;
377 opts
.fn
= oneway_merge
;
378 opts
.verbose_update
= !o
->quiet
&& isatty(2);
379 opts
.src_index
= &the_index
;
380 opts
.dst_index
= &the_index
;
382 init_tree_desc(&tree_desc
, tree
->buffer
, tree
->size
);
383 switch (unpack_trees(1, &tree_desc
, &opts
)) {
387 * We return 0 nevertheless, as the index is all right
388 * and more importantly we have made best efforts to
389 * update paths in the work tree, and we cannot revert
400 const char *name
; /* The short name used */
401 const char *path
; /* The full name of a real branch */
402 struct commit
*commit
; /* The named commit */
405 static void setup_branch_path(struct branch_info
*branch
)
407 struct strbuf buf
= STRBUF_INIT
;
409 strbuf_branchname(&buf
, branch
->name
);
410 if (strcmp(buf
.buf
, branch
->name
))
411 branch
->name
= xstrdup(buf
.buf
);
412 strbuf_splice(&buf
, 0, 0, "refs/heads/", 11);
413 branch
->path
= strbuf_detach(&buf
, NULL
);
416 static int merge_working_tree(const struct checkout_opts
*opts
,
417 struct branch_info
*old
,
418 struct branch_info
*new,
422 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
423 int newfd
= hold_locked_index(lock_file
, 1);
425 if (read_cache_preload(NULL
) < 0)
426 return error(_("corrupt index file"));
428 resolve_undo_clear();
430 ret
= reset_tree(new->commit
->tree
, opts
, 1, writeout_error
);
434 struct tree_desc trees
[2];
436 struct unpack_trees_options topts
;
438 memset(&topts
, 0, sizeof(topts
));
440 topts
.src_index
= &the_index
;
441 topts
.dst_index
= &the_index
;
443 setup_unpack_trees_porcelain(&topts
, "checkout");
445 refresh_cache(REFRESH_QUIET
);
447 if (unmerged_cache()) {
448 error(_("you need to resolve your current index first"));
452 /* 2-way merge to the new branch */
453 topts
.initial_checkout
= is_cache_unborn();
456 topts
.gently
= opts
->merge
&& old
->commit
;
457 topts
.verbose_update
= !opts
->quiet
&& isatty(2);
458 topts
.fn
= twoway_merge
;
459 if (opts
->overwrite_ignore
) {
460 topts
.dir
= xcalloc(1, sizeof(*topts
.dir
));
461 topts
.dir
->flags
|= DIR_SHOW_IGNORED
;
462 setup_standard_excludes(topts
.dir
);
464 tree
= parse_tree_indirect(old
->commit
?
465 old
->commit
->object
.sha1
:
466 EMPTY_TREE_SHA1_BIN
);
467 init_tree_desc(&trees
[0], tree
->buffer
, tree
->size
);
468 tree
= parse_tree_indirect(new->commit
->object
.sha1
);
469 init_tree_desc(&trees
[1], tree
->buffer
, tree
->size
);
471 ret
= unpack_trees(2, trees
, &topts
);
474 * Unpack couldn't do a trivial merge; either
475 * give up or do a real merge, depending on
476 * whether the merge flag was used.
480 struct merge_options o
;
485 * Without old->commit, the below is the same as
486 * the two-tree unpack we already tried and failed.
491 /* Do more real merge */
494 * We update the index fully, then write the
495 * tree from the index, then merge the new
496 * branch with the current tree, with the old
497 * branch as the base. Then we reset the index
498 * (but not the working tree) to the new
499 * branch, leaving the working tree as the
500 * merged version, but skipping unmerged
501 * entries in the index.
504 add_files_to_cache(NULL
, NULL
, 0);
506 * NEEDSWORK: carrying over local changes
507 * when branches have different end-of-line
508 * normalization (or clean+smudge rules) is
509 * a pain; plumb in an option to set
512 init_merge_options(&o
);
514 work
= write_tree_from_memory(&o
);
516 ret
= reset_tree(new->commit
->tree
, opts
, 1,
520 o
.ancestor
= old
->name
;
521 o
.branch1
= new->name
;
523 merge_trees(&o
, new->commit
->tree
, work
,
524 old
->commit
->tree
, &result
);
525 ret
= reset_tree(new->commit
->tree
, opts
, 0,
532 if (write_cache(newfd
, active_cache
, active_nr
) ||
533 commit_locked_index(lock_file
))
534 die(_("unable to write new index file"));
536 if (!opts
->force
&& !opts
->quiet
)
537 show_local_changes(&new->commit
->object
, &opts
->diff_options
);
542 static void report_tracking(struct branch_info
*new)
544 struct strbuf sb
= STRBUF_INIT
;
545 struct branch
*branch
= branch_get(new->name
);
547 if (!format_tracking_info(branch
, &sb
))
549 fputs(sb
.buf
, stdout
);
553 static void update_refs_for_switch(const struct checkout_opts
*opts
,
554 struct branch_info
*old
,
555 struct branch_info
*new)
557 struct strbuf msg
= STRBUF_INIT
;
558 const char *old_desc
;
559 if (opts
->new_branch
) {
560 if (opts
->new_orphan_branch
) {
561 if (opts
->new_branch_log
&& !log_all_ref_updates
) {
563 char log_file
[PATH_MAX
];
564 char *ref_name
= mkpath("refs/heads/%s", opts
->new_orphan_branch
);
566 temp
= log_all_ref_updates
;
567 log_all_ref_updates
= 1;
568 if (log_ref_setup(ref_name
, log_file
, sizeof(log_file
))) {
569 fprintf(stderr
, _("Can not do reflog for '%s'\n"),
570 opts
->new_orphan_branch
);
571 log_all_ref_updates
= temp
;
574 log_all_ref_updates
= temp
;
578 create_branch(old
->name
, opts
->new_branch
, new->name
,
579 opts
->new_branch_force
? 1 : 0,
580 opts
->new_branch_log
,
581 opts
->new_branch_force
? 1 : 0,
584 new->name
= opts
->new_branch
;
585 setup_branch_path(new);
588 old_desc
= old
->name
;
589 if (!old_desc
&& old
->commit
)
590 old_desc
= sha1_to_hex(old
->commit
->object
.sha1
);
591 strbuf_addf(&msg
, "checkout: moving from %s to %s",
592 old_desc
? old_desc
: "(invalid)", new->name
);
594 if (!strcmp(new->name
, "HEAD") && !new->path
&& !opts
->force_detach
) {
596 } else if (opts
->force_detach
|| !new->path
) { /* No longer on any branch. */
597 update_ref(msg
.buf
, "HEAD", new->commit
->object
.sha1
, NULL
,
598 REF_NODEREF
, DIE_ON_ERR
);
600 if (old
->path
&& advice_detached_head
)
601 detach_advice(new->name
);
602 describe_detached_head(_("HEAD is now at"), new->commit
);
604 } else if (new->path
) { /* Switch branches. */
605 create_symref("HEAD", new->path
, msg
.buf
);
607 if (old
->path
&& !strcmp(new->path
, old
->path
)) {
608 if (opts
->new_branch_force
)
609 fprintf(stderr
, _("Reset branch '%s'\n"),
612 fprintf(stderr
, _("Already on '%s'\n"),
614 } else if (opts
->new_branch
) {
615 if (opts
->branch_exists
)
616 fprintf(stderr
, _("Switched to and reset branch '%s'\n"), new->name
);
618 fprintf(stderr
, _("Switched to a new branch '%s'\n"), new->name
);
620 fprintf(stderr
, _("Switched to branch '%s'\n"),
624 if (old
->path
&& old
->name
) {
625 char log_file
[PATH_MAX
], ref_file
[PATH_MAX
];
627 git_snpath(log_file
, sizeof(log_file
), "logs/%s", old
->path
);
628 git_snpath(ref_file
, sizeof(ref_file
), "%s", old
->path
);
629 if (!file_exists(ref_file
) && file_exists(log_file
))
630 remove_path(log_file
);
633 remove_branch_state();
634 strbuf_release(&msg
);
636 (new->path
|| (!opts
->force_detach
&& !strcmp(new->name
, "HEAD"))))
637 report_tracking(new);
640 static int add_pending_uninteresting_ref(const char *refname
,
641 const unsigned char *sha1
,
642 int flags
, void *cb_data
)
644 add_pending_sha1(cb_data
, refname
, sha1
, UNINTERESTING
);
648 static void describe_one_orphan(struct strbuf
*sb
, struct commit
*commit
)
650 parse_commit(commit
);
651 strbuf_addstr(sb
, " ");
653 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
654 strbuf_addch(sb
, ' ');
655 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, sb
);
656 strbuf_addch(sb
, '\n');
659 #define ORPHAN_CUTOFF 4
660 static void suggest_reattach(struct commit
*commit
, struct rev_info
*revs
)
662 struct commit
*c
, *last
= NULL
;
663 struct strbuf sb
= STRBUF_INIT
;
665 while ((c
= get_revision(revs
)) != NULL
) {
666 if (lost
< ORPHAN_CUTOFF
)
667 describe_one_orphan(&sb
, c
);
671 if (ORPHAN_CUTOFF
< lost
) {
672 int more
= lost
- ORPHAN_CUTOFF
;
674 describe_one_orphan(&sb
, last
);
676 strbuf_addf(&sb
, _(" ... and %d more.\n"), more
);
681 /* The singular version */
682 "Warning: you are leaving %d commit behind, "
684 "any of your branches:\n\n"
686 /* The plural version */
687 "Warning: you are leaving %d commits behind, "
689 "any of your branches:\n\n"
691 /* Give ngettext() the count */
697 if (advice_detached_head
)
700 "If you want to keep them by creating a new branch, "
701 "this may be a good time\nto do so with:\n\n"
702 " git branch new_branch_name %s\n\n"),
703 sha1_to_hex(commit
->object
.sha1
));
707 * We are about to leave commit that was at the tip of a detached
708 * HEAD. If it is not reachable from any ref, this is the last chance
709 * for the user to do so without resorting to reflog.
711 static void orphaned_commit_warning(struct commit
*old
, struct commit
*new)
713 struct rev_info revs
;
714 struct object
*object
= &old
->object
;
715 struct object_array refs
;
717 init_revisions(&revs
, NULL
);
718 setup_revisions(0, NULL
, &revs
, NULL
);
720 object
->flags
&= ~UNINTERESTING
;
721 add_pending_object(&revs
, object
, sha1_to_hex(object
->sha1
));
723 for_each_ref(add_pending_uninteresting_ref
, &revs
);
724 add_pending_sha1(&revs
, "HEAD", new->object
.sha1
, UNINTERESTING
);
727 revs
.leak_pending
= 1;
729 if (prepare_revision_walk(&revs
))
730 die(_("internal error in revision walk"));
731 if (!(old
->object
.flags
& UNINTERESTING
))
732 suggest_reattach(old
, &revs
);
734 describe_detached_head(_("Previous HEAD position was"), old
);
736 clear_commit_marks_for_object_array(&refs
, ALL_REV_FLAGS
);
740 static int switch_branches(const struct checkout_opts
*opts
,
741 struct branch_info
*new)
744 struct branch_info old
;
746 unsigned char rev
[20];
747 int flag
, writeout_error
= 0;
748 memset(&old
, 0, sizeof(old
));
749 old
.path
= path_to_free
= resolve_refdup("HEAD", rev
, 0, &flag
);
750 old
.commit
= lookup_commit_reference_gently(rev
, 1);
751 if (!(flag
& REF_ISSYMREF
))
754 if (old
.path
&& !prefixcmp(old
.path
, "refs/heads/"))
755 old
.name
= old
.path
+ strlen("refs/heads/");
759 new->commit
= old
.commit
;
761 die(_("You are on a branch yet to be born"));
762 parse_commit(new->commit
);
765 ret
= merge_working_tree(opts
, &old
, new, &writeout_error
);
771 if (!opts
->quiet
&& !old
.path
&& old
.commit
&& new->commit
!= old
.commit
)
772 orphaned_commit_warning(old
.commit
, new->commit
);
774 update_refs_for_switch(opts
, &old
, new);
776 ret
= post_checkout_hook(old
.commit
, new->commit
, 1);
778 return ret
|| writeout_error
;
781 static int git_checkout_config(const char *var
, const char *value
, void *cb
)
783 if (!strcmp(var
, "diff.ignoresubmodules")) {
784 struct checkout_opts
*opts
= cb
;
785 handle_ignore_submodules_arg(&opts
->diff_options
, value
);
789 if (!prefixcmp(var
, "submodule."))
790 return parse_submodule_config_option(var
, value
);
792 return git_xmerge_config(var
, value
, NULL
);
795 struct tracking_name_data
{
801 static int check_tracking_name(const char *refname
, const unsigned char *sha1
,
802 int flags
, void *cb_data
)
804 struct tracking_name_data
*cb
= cb_data
;
807 if (prefixcmp(refname
, "refs/remotes/"))
809 slash
= strchr(refname
+ 13, '/');
810 if (!slash
|| strcmp(slash
+ 1, cb
->name
))
816 cb
->remote
= xstrdup(refname
);
820 static const char *unique_tracking_name(const char *name
)
822 struct tracking_name_data cb_data
= { NULL
, NULL
, 1 };
824 for_each_ref(check_tracking_name
, &cb_data
);
826 return cb_data
.remote
;
827 free(cb_data
.remote
);
831 static int parse_branchname_arg(int argc
, const char **argv
,
832 int dwim_new_local_branch_ok
,
833 struct branch_info
*new,
834 struct tree
**source_tree
,
835 unsigned char rev
[20],
836 const char **new_branch
)
839 unsigned char branch_rev
[20];
844 * case 1: git checkout <ref> -- [<paths>]
846 * <ref> must be a valid tree, everything after the '--' must be
849 * case 2: git checkout -- [<paths>]
851 * everything after the '--' must be paths.
853 * case 3: git checkout <something> [<paths>]
855 * With no paths, if <something> is a commit, that is to
856 * switch to the branch or detach HEAD at it. As a special case,
857 * if <something> is A...B (missing A or B means HEAD but you can
858 * omit at most one side), and if there is a unique merge base
859 * between A and B, A...B names that merge base.
861 * With no paths, if <something> is _not_ a commit, no -t nor -b
862 * was given, and there is a tracking branch whose name is
863 * <something> in one and only one remote, then this is a short-hand
864 * to fork local <something> from that remote-tracking branch.
866 * Otherwise <something> shall not be ambiguous.
867 * - If it's *only* a reference, treat it like case (1).
868 * - If it's only a path, treat it like case (2).
875 if (!strcmp(argv
[0], "--")) /* case (2) */
879 has_dash_dash
= (argc
> 1) && !strcmp(argv
[1], "--");
881 if (!strcmp(arg
, "-"))
884 if (get_sha1_mb(arg
, rev
)) {
885 if (has_dash_dash
) /* case (1) */
886 die(_("invalid reference: %s"), arg
);
887 if (dwim_new_local_branch_ok
&&
888 !check_filename(NULL
, arg
) &&
890 const char *remote
= unique_tracking_name(arg
);
891 if (!remote
|| get_sha1(remote
, rev
))
895 /* DWIMmed to create local branch */
901 /* we can't end up being in (2) anymore, eat the argument */
907 setup_branch_path(new);
909 if (!check_refname_format(new->path
, 0) &&
910 !read_ref(new->path
, branch_rev
))
911 hashcpy(rev
, branch_rev
);
913 new->path
= NULL
; /* not an existing branch */
915 new->commit
= lookup_commit_reference_gently(rev
, 1);
918 *source_tree
= parse_tree_indirect(rev
);
920 parse_commit(new->commit
);
921 *source_tree
= new->commit
->tree
;
924 if (!*source_tree
) /* case (1): want a tree */
925 die(_("reference is not a tree: %s"), arg
);
926 if (!has_dash_dash
) {/* case (3 -> 1) */
928 * Do not complain the most common case
929 * git checkout branch
930 * even if there happen to be a file called 'branch';
931 * it would be extremely annoying.
934 verify_non_filename(NULL
, arg
);
944 static int switch_unborn_to_new_branch(const struct checkout_opts
*opts
)
947 struct strbuf branch_ref
= STRBUF_INIT
;
949 if (!opts
->new_branch
)
950 die(_("You are on a branch yet to be born"));
951 strbuf_addf(&branch_ref
, "refs/heads/%s", opts
->new_branch
);
952 status
= create_symref("HEAD", branch_ref
.buf
, "checkout -b");
953 strbuf_release(&branch_ref
);
957 static int checkout_branch(struct checkout_opts
*opts
,
958 struct branch_info
*new)
961 die(_("paths cannot be used with switching branches"));
963 if (opts
->patch_mode
)
964 die(_("'%s' cannot be used with switching branches"),
967 if (opts
->writeout_stage
)
968 die(_("'%s' cannot be used with switching branches"),
971 if (opts
->force
&& opts
->merge
)
972 die(_("'%s' cannot be used with '%s'"), "-f", "-m");
974 if (opts
->force_detach
&& opts
->new_branch
)
975 die(_("'%s' cannot be used with '%s'"),
976 "--detach", "-b/-B/--orphan");
978 if (opts
->new_orphan_branch
) {
979 if (opts
->track
!= BRANCH_TRACK_UNSPECIFIED
)
980 die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
981 } else if (opts
->force_detach
) {
982 if (opts
->track
!= BRANCH_TRACK_UNSPECIFIED
)
983 die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
984 } else if (opts
->track
== BRANCH_TRACK_UNSPECIFIED
)
985 opts
->track
= git_branch_track
;
987 if (new->name
&& !new->commit
)
988 die(_("Cannot switch branch to a non-commit '%s'"),
991 if (!new->commit
&& opts
->new_branch
) {
992 unsigned char rev
[20];
995 if (!read_ref_full("HEAD", rev
, 0, &flag
) &&
996 (flag
& REF_ISSYMREF
) && is_null_sha1(rev
))
997 return switch_unborn_to_new_branch(opts
);
999 return switch_branches(opts
, new);
1002 int cmd_checkout(int argc
, const char **argv
, const char *prefix
)
1004 struct checkout_opts opts
;
1005 struct branch_info
new;
1006 char *conflict_style
= NULL
;
1007 int dwim_new_local_branch
= 1;
1008 struct option options
[] = {
1009 OPT__QUIET(&opts
.quiet
, "suppress progress reporting"),
1010 OPT_STRING('b', NULL
, &opts
.new_branch
, "branch",
1011 "create and checkout a new branch"),
1012 OPT_STRING('B', NULL
, &opts
.new_branch_force
, "branch",
1013 "create/reset and checkout a branch"),
1014 OPT_BOOLEAN('l', NULL
, &opts
.new_branch_log
, "create reflog for new branch"),
1015 OPT_BOOLEAN(0, "detach", &opts
.force_detach
, "detach the HEAD at named commit"),
1016 OPT_SET_INT('t', "track", &opts
.track
, "set upstream info for new branch",
1017 BRANCH_TRACK_EXPLICIT
),
1018 OPT_STRING(0, "orphan", &opts
.new_orphan_branch
, "new branch", "new unparented branch"),
1019 OPT_SET_INT('2', "ours", &opts
.writeout_stage
, "checkout our version for unmerged files",
1021 OPT_SET_INT('3', "theirs", &opts
.writeout_stage
, "checkout their version for unmerged files",
1023 OPT__FORCE(&opts
.force
, "force checkout (throw away local modifications)"),
1024 OPT_BOOLEAN('m', "merge", &opts
.merge
, "perform a 3-way merge with the new branch"),
1025 OPT_BOOLEAN(0, "overwrite-ignore", &opts
.overwrite_ignore
, "update ignored files (default)"),
1026 OPT_STRING(0, "conflict", &conflict_style
, "style",
1027 "conflict style (merge or diff3)"),
1028 OPT_BOOLEAN('p', "patch", &opts
.patch_mode
, "select hunks interactively"),
1029 { OPTION_BOOLEAN
, 0, "guess", &dwim_new_local_branch
, NULL
,
1030 "second guess 'git checkout no-such-branch'",
1031 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
},
1035 memset(&opts
, 0, sizeof(opts
));
1036 memset(&new, 0, sizeof(new));
1037 opts
.overwrite_ignore
= 1;
1038 opts
.prefix
= prefix
;
1040 gitmodules_config();
1041 git_config(git_checkout_config
, &opts
);
1043 opts
.track
= BRANCH_TRACK_UNSPECIFIED
;
1045 argc
= parse_options(argc
, argv
, prefix
, options
, checkout_usage
,
1046 PARSE_OPT_KEEP_DASHDASH
);
1048 if (conflict_style
) {
1049 opts
.merge
= 1; /* implied */
1050 git_xmerge_config("merge.conflictstyle", conflict_style
, NULL
);
1053 if ((!!opts
.new_branch
+ !!opts
.new_branch_force
+ !!opts
.new_orphan_branch
) > 1)
1054 die(_("-b, -B and --orphan are mutually exclusive"));
1057 * From here on, new_branch will contain the branch to be checked out,
1058 * and new_branch_force and new_orphan_branch will tell us which one of
1059 * -b/-B/--orphan is being used.
1061 if (opts
.new_branch_force
)
1062 opts
.new_branch
= opts
.new_branch_force
;
1064 if (opts
.new_orphan_branch
)
1065 opts
.new_branch
= opts
.new_orphan_branch
;
1067 /* --track without -b/-B/--orphan should DWIM */
1068 if (opts
.track
!= BRANCH_TRACK_UNSPECIFIED
&& !opts
.new_branch
) {
1069 const char *argv0
= argv
[0];
1070 if (!argc
|| !strcmp(argv0
, "--"))
1071 die (_("--track needs a branch name"));
1072 if (!prefixcmp(argv0
, "refs/"))
1074 if (!prefixcmp(argv0
, "remotes/"))
1076 argv0
= strchr(argv0
, '/');
1077 if (!argv0
|| !argv0
[1])
1078 die (_("Missing branch name; try -b"));
1079 opts
.new_branch
= argv0
+ 1;
1083 * Extract branch name from command line arguments, so
1084 * all that is left is pathspecs.
1088 * 1) git checkout <tree> -- [<paths>]
1089 * 2) git checkout -- [<paths>]
1090 * 3) git checkout <something> [<paths>]
1092 * including "last branch" syntax and DWIM-ery for names of
1093 * remote branches, erroring out for invalid or ambiguous cases.
1096 unsigned char rev
[20];
1099 dwim_new_local_branch
&&
1100 opts
.track
== BRANCH_TRACK_UNSPECIFIED
&&
1102 int n
= parse_branchname_arg(argc
, argv
, dwim_ok
,
1103 &new, &opts
.source_tree
,
1104 rev
, &opts
.new_branch
);
1110 opts
.pathspec
= get_pathspec(prefix
, argv
);
1113 die(_("invalid path specification"));
1116 * Try to give more helpful suggestion.
1117 * new_branch && argc > 1 will be caught later.
1119 if (opts
.new_branch
&& argc
== 1)
1120 die(_("Cannot update paths and switch to branch '%s' at the same time.\n"
1121 "Did you intend to checkout '%s' which can not be resolved as commit?"),
1122 opts
.new_branch
, argv
[0]);
1124 if (opts
.force_detach
)
1125 die(_("git checkout: --detach does not take a path argument '%s'"),
1128 if (1 < !!opts
.writeout_stage
+ !!opts
.force
+ !!opts
.merge
)
1129 die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1130 "checking out of the index."));
1133 if (opts
.new_branch
) {
1134 struct strbuf buf
= STRBUF_INIT
;
1136 opts
.branch_exists
=
1137 validate_new_branchname(opts
.new_branch
, &buf
,
1138 !!opts
.new_branch_force
,
1139 !!opts
.new_branch_force
);
1141 strbuf_release(&buf
);
1144 if (opts
.patch_mode
|| opts
.pathspec
)
1145 return checkout_paths(&opts
, new.name
);
1147 return checkout_branch(&opts
, &new);