3 #include "parse-options.h"
8 #include "unpack-trees.h"
10 #include "run-command.h"
11 #include "merge-recursive.h"
17 static const char * const checkout_usage
[] = {
18 "git checkout [options] <branch>",
19 "git checkout [options] [<branch>] -- <file>...",
23 static int post_checkout_hook(struct commit
*old
, struct commit
*new,
26 struct child_process proc
;
27 const char *name
= git_path("hooks/post-checkout");
30 if (access(name
, X_OK
) < 0)
33 memset(&proc
, 0, sizeof(proc
));
35 argv
[1] = xstrdup(sha1_to_hex(old
->object
.sha1
));
36 argv
[2] = xstrdup(sha1_to_hex(new->object
.sha1
));
37 argv
[3] = changed
? "1" : "0";
41 proc
.stdout_to_stderr
= 1;
42 return run_command(&proc
);
45 static int update_some(const unsigned char *sha1
, const char *base
, int baselen
,
46 const char *pathname
, unsigned mode
, int stage
)
49 struct cache_entry
*ce
;
51 if (S_ISGITLINK(mode
))
55 return READ_TREE_RECURSIVE
;
57 len
= baselen
+ strlen(pathname
);
58 ce
= xcalloc(1, cache_entry_size(len
));
59 hashcpy(ce
->sha1
, sha1
);
60 memcpy(ce
->name
, base
, baselen
);
61 memcpy(ce
->name
+ baselen
, pathname
, len
- baselen
);
62 ce
->ce_flags
= create_ce_flags(len
, 0);
63 ce
->ce_mode
= create_ce_mode(mode
);
64 add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
68 static int read_tree_some(struct tree
*tree
, const char **pathspec
)
71 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
72 newfd
= hold_locked_index(lock_file
, 1);
75 read_tree_recursive(tree
, "", 0, 0, pathspec
, update_some
);
77 if (write_cache(newfd
, active_cache
, active_nr
) ||
78 commit_locked_index(lock_file
))
79 die("unable to write new index file");
81 /* update the index with the given tree's info
82 * for all args, expanding wildcards, and exit
83 * with any non-zero return code.
88 static int checkout_paths(const char **pathspec
)
91 struct checkout state
;
92 static char *ps_matched
;
93 unsigned char rev
[20];
97 for (pos
= 0; pathspec
[pos
]; pos
++)
99 ps_matched
= xcalloc(1, pos
);
101 for (pos
= 0; pos
< active_nr
; pos
++) {
102 struct cache_entry
*ce
= active_cache
[pos
];
103 pathspec_match(pathspec
, ps_matched
, ce
->name
, 0);
106 if (report_path_error(ps_matched
, pathspec
, 0))
109 memset(&state
, 0, sizeof(state
));
111 state
.refresh_cache
= 1;
112 for (pos
= 0; pos
< active_nr
; pos
++) {
113 struct cache_entry
*ce
= active_cache
[pos
];
114 if (pathspec_match(pathspec
, NULL
, ce
->name
, 0)) {
115 checkout_entry(ce
, &state
, NULL
);
119 resolve_ref("HEAD", rev
, 0, &flag
);
120 head
= lookup_commit_reference_gently(rev
, 1);
122 return post_checkout_hook(head
, head
, 0);
125 static void show_local_changes(struct object
*head
)
128 /* I think we want full paths, even if we're in a subdirectory. */
129 init_revisions(&rev
, NULL
);
131 rev
.diffopt
.output_format
|= DIFF_FORMAT_NAME_STATUS
;
132 add_pending_object(&rev
, head
, NULL
);
133 run_diff_index(&rev
, 0);
136 static void describe_detached_head(char *msg
, struct commit
*commit
)
140 parse_commit(commit
);
141 pretty_print_commit(CMIT_FMT_ONELINE
, commit
, &sb
, 0, "", "", 0, 0);
142 fprintf(stderr
, "%s %s... %s\n", msg
,
143 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
), sb
.buf
);
147 static int reset_to_new(struct tree
*tree
, int quiet
)
149 struct unpack_trees_options opts
;
150 struct tree_desc tree_desc
;
151 memset(&opts
, 0, sizeof(opts
));
156 opts
.fn
= oneway_merge
;
157 opts
.verbose_update
= !quiet
;
159 init_tree_desc(&tree_desc
, tree
->buffer
, tree
->size
);
160 if (unpack_trees(1, &tree_desc
, &opts
))
165 static void reset_clean_to_new(struct tree
*tree
, int quiet
)
167 struct unpack_trees_options opts
;
168 struct tree_desc tree_desc
;
169 memset(&opts
, 0, sizeof(opts
));
171 opts
.skip_unmerged
= 1;
174 opts
.fn
= oneway_merge
;
175 opts
.verbose_update
= !quiet
;
177 init_tree_desc(&tree_desc
, tree
->buffer
, tree
->size
);
178 if (unpack_trees(1, &tree_desc
, &opts
))
182 struct checkout_opts
{
193 const char *name
; /* The short name used */
194 const char *path
; /* The full name of a real branch */
195 struct commit
*commit
; /* The named commit */
198 static void setup_branch_path(struct branch_info
*branch
)
201 strbuf_init(&buf
, 0);
202 strbuf_addstr(&buf
, "refs/heads/");
203 strbuf_addstr(&buf
, branch
->name
);
204 branch
->path
= strbuf_detach(&buf
, NULL
);
207 static int merge_working_tree(struct checkout_opts
*opts
,
208 struct branch_info
*old
, struct branch_info
*new)
211 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
212 int newfd
= hold_locked_index(lock_file
, 1);
216 ret
= reset_to_new(new->commit
->tree
, opts
->quiet
);
220 struct tree_desc trees
[2];
222 struct unpack_trees_options topts
;
223 memset(&topts
, 0, sizeof(topts
));
226 refresh_cache(REFRESH_QUIET
);
228 if (unmerged_cache()) {
229 ret
= opts
->merge
? -1 :
230 error("you need to resolve your current index first");
234 topts
.gently
= opts
->merge
;
235 topts
.fn
= twoway_merge
;
236 topts
.dir
= xcalloc(1, sizeof(*topts
.dir
));
237 topts
.dir
->show_ignored
= 1;
238 topts
.dir
->exclude_per_dir
= ".gitignore";
239 tree
= parse_tree_indirect(old
->commit
->object
.sha1
);
240 init_tree_desc(&trees
[0], tree
->buffer
, tree
->size
);
241 tree
= parse_tree_indirect(new->commit
->object
.sha1
);
242 init_tree_desc(&trees
[1], tree
->buffer
, tree
->size
);
243 ret
= unpack_trees(2, trees
, &topts
);
247 * Unpack couldn't do a trivial merge; either
248 * give up or do a real merge, depending on
249 * whether the merge flag was used.
255 parse_commit(old
->commit
);
257 /* Do more real merge */
260 * We update the index fully, then write the
261 * tree from the index, then merge the new
262 * branch with the current tree, with the old
263 * branch as the base. Then we reset the index
264 * (but not the working tree) to the new
265 * branch, leaving the working tree as the
266 * merged version, but skipping unmerged
267 * entries in the index.
270 add_files_to_cache(0, NULL
, NULL
);
271 work
= write_tree_from_memory();
273 ret
= reset_to_new(new->commit
->tree
, opts
->quiet
);
276 merge_trees(new->commit
->tree
, work
, old
->commit
->tree
,
277 new->name
, "local", &result
);
278 reset_clean_to_new(new->commit
->tree
, opts
->quiet
);
282 if (write_cache(newfd
, active_cache
, active_nr
) ||
283 commit_locked_index(lock_file
))
284 die("unable to write new index file");
287 show_local_changes(&new->commit
->object
);
292 static void adjust_to_tracking(struct branch_info
*new, struct checkout_opts
*opts
)
295 * We have switched to a new branch; is it building on
296 * top of another branch, and if so does that other branch
297 * have changes we do not have yet?
300 unsigned char sha1
[20];
301 struct commit
*ours
, *theirs
;
303 struct rev_info revs
;
304 const char *rev_argv
[10];
306 int num_ours
, num_theirs
;
307 const char *remote_msg
;
308 struct branch
*branch
= branch_get(NULL
);
311 * Nothing to report unless we are marked to build on top of
314 if (!branch
|| !branch
->merge
)
318 * If what we used to build on no longer exists, there is
321 base
= branch
->merge
[0]->dst
;
322 if (!resolve_ref(base
, sha1
, 1, NULL
))
325 theirs
= lookup_commit(sha1
);
327 if (!hashcmp(sha1
, ours
->object
.sha1
))
328 return; /* we are the same */
330 /* Run "rev-list --left-right ours...theirs" internally... */
332 rev_argv
[rev_argc
++] = NULL
;
333 rev_argv
[rev_argc
++] = "--left-right";
334 rev_argv
[rev_argc
++] = symmetric
;
335 rev_argv
[rev_argc
++] = "--";
336 rev_argv
[rev_argc
] = NULL
;
338 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
339 strcpy(symmetric
+ 40, "...");
340 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
342 init_revisions(&revs
, NULL
);
343 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
344 prepare_revision_walk(&revs
);
346 /* ... and count the commits on each side. */
350 struct commit
*c
= get_revision(&revs
);
353 if (c
->object
.flags
& SYMMETRIC_LEFT
)
359 if (!prefixcmp(base
, "refs/remotes/")) {
360 remote_msg
= " remote";
361 base
+= strlen("refs/remotes/");
367 printf("Your branch is ahead of the tracked%s branch '%s' "
370 num_ours
, (num_ours
== 1) ? "" : "s");
372 printf("Your branch is behind of the tracked%s branch '%s' "
374 "and can be fast-forwarded.\n",
376 num_theirs
, (num_theirs
== 1) ? "" : "s");
378 printf("Your branch and the tracked%s branch '%s' "
379 "have diverged,\nand respectively "
380 "have %d and %d different commit(s) each.\n",
382 num_ours
, num_theirs
);
385 static void update_refs_for_switch(struct checkout_opts
*opts
,
386 struct branch_info
*old
,
387 struct branch_info
*new)
390 const char *old_desc
;
391 if (opts
->new_branch
) {
392 create_branch(old
->name
, opts
->new_branch
, new->name
, 0,
393 opts
->new_branch_log
, opts
->track
);
394 new->name
= opts
->new_branch
;
395 setup_branch_path(new);
398 strbuf_init(&msg
, 0);
399 old_desc
= old
->name
;
401 old_desc
= sha1_to_hex(old
->commit
->object
.sha1
);
402 strbuf_addf(&msg
, "checkout: moving from %s to %s",
403 old_desc
, new->name
);
406 create_symref("HEAD", new->path
, msg
.buf
);
408 if (old
->path
&& !strcmp(new->path
, old
->path
))
409 fprintf(stderr
, "Already on \"%s\"\n",
412 fprintf(stderr
, "Switched to%s branch \"%s\"\n",
413 opts
->new_branch
? " a new" : "",
416 } else if (strcmp(new->name
, "HEAD")) {
417 update_ref(msg
.buf
, "HEAD", new->commit
->object
.sha1
, NULL
,
418 REF_NODEREF
, DIE_ON_ERR
);
421 fprintf(stderr
, "Note: moving to \"%s\" which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n git checkout -b <new_branch_name>\n", new->name
);
422 describe_detached_head("HEAD is now at", new->commit
);
425 remove_branch_state();
426 strbuf_release(&msg
);
427 if (!opts
->quiet
&& (new->path
|| !strcmp(new->name
, "HEAD")))
428 adjust_to_tracking(new, opts
);
431 static int switch_branches(struct checkout_opts
*opts
, struct branch_info
*new)
434 struct branch_info old
;
435 unsigned char rev
[20];
437 memset(&old
, 0, sizeof(old
));
438 old
.path
= resolve_ref("HEAD", rev
, 0, &flag
);
439 old
.commit
= lookup_commit_reference_gently(rev
, 1);
440 if (!(flag
& REF_ISSYMREF
))
443 if (old
.path
&& !prefixcmp(old
.path
, "refs/heads/"))
444 old
.name
= old
.path
+ strlen("refs/heads/");
448 new->commit
= old
.commit
;
450 die("You are on a branch yet to be born");
451 parse_commit(new->commit
);
455 * If the new thing isn't a branch and isn't HEAD and we're
456 * not starting a new branch, and we want messages, and we
457 * weren't on a branch, and we're moving to a new commit,
458 * describe the old commit.
460 if (!new->path
&& strcmp(new->name
, "HEAD") && !opts
->new_branch
&&
461 !opts
->quiet
&& !old
.path
&& new->commit
!= old
.commit
)
462 describe_detached_head("Previous HEAD position was", old
.commit
);
466 fprintf(stderr
, "warning: You appear to be on a branch yet to be born.\n");
467 fprintf(stderr
, "warning: Forcing checkout of %s.\n", new->name
);
472 ret
= merge_working_tree(opts
, &old
, new);
476 update_refs_for_switch(opts
, &old
, new);
478 return post_checkout_hook(old
.commit
, new->commit
, 1);
481 static int branch_track
= 0;
483 static int git_checkout_config(const char *var
, const char *value
)
485 if (!strcmp(var
, "branch.autosetupmerge"))
486 branch_track
= git_config_bool(var
, value
);
488 return git_default_config(var
, value
);
491 int cmd_checkout(int argc
, const char **argv
, const char *prefix
)
493 struct checkout_opts opts
;
494 unsigned char rev
[20];
496 struct branch_info
new;
497 struct tree
*source_tree
= NULL
;
498 struct option options
[] = {
499 OPT__QUIET(&opts
.quiet
),
500 OPT_STRING('b', NULL
, &opts
.new_branch
, "new branch", "branch"),
501 OPT_BOOLEAN('l', NULL
, &opts
.new_branch_log
, "log for new branch"),
502 OPT_BOOLEAN( 0 , "track", &opts
.track
, "track"),
503 OPT_BOOLEAN('f', NULL
, &opts
.force
, "force"),
504 OPT_BOOLEAN('m', NULL
, &opts
.merge
, "merge"),
508 memset(&opts
, 0, sizeof(opts
));
509 memset(&new, 0, sizeof(new));
511 git_config(git_checkout_config
);
513 opts
.track
= branch_track
;
515 argc
= parse_options(argc
, argv
, options
, checkout_usage
, 0);
518 if (get_sha1(arg
, rev
))
520 else if ((new.commit
= lookup_commit_reference_gently(rev
, 1))) {
522 setup_branch_path(&new);
523 if (resolve_ref(new.path
, rev
, 1, NULL
))
524 new.commit
= lookup_commit_reference(rev
);
527 parse_commit(new.commit
);
528 source_tree
= new.commit
->tree
;
531 } else if ((source_tree
= parse_tree_indirect(rev
))) {
537 if (argc
&& !strcmp(argv
[0], "--")) {
542 if (!opts
.new_branch
&& (opts
.track
!= branch_track
))
543 die("git checkout: --track and --no-track require -b");
545 if (opts
.force
&& opts
.merge
)
546 die("git checkout: -f and -m are incompatible");
549 const char **pathspec
= get_pathspec(prefix
, argv
);
551 if (opts
.new_branch
|| opts
.force
|| opts
.merge
) {
553 die("git checkout: updating paths is incompatible with switching branches/forcing\nDid you intend to checkout '%s' which can not be resolved as commit?", argv
[0]);
555 die("git checkout: updating paths is incompatible with switching branches/forcing");
560 read_tree_some(source_tree
, pathspec
);
563 return checkout_paths(pathspec
);
566 if (new.name
&& !new.commit
) {
567 die("Cannot switch branch to a non-commit.");
570 return switch_branches(&opts
, &new);