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
, void *context
)
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
)
70 read_tree_recursive(tree
, "", 0, 0, pathspec
, update_some
, NULL
);
72 /* update the index with the given tree's info
73 * for all args, expanding wildcards, and exit
74 * with any non-zero return code.
79 static int checkout_paths(struct tree
*source_tree
, const char **pathspec
)
82 struct checkout state
;
83 static char *ps_matched
;
84 unsigned char rev
[20];
90 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
92 newfd
= hold_locked_index(lock_file
, 1);
96 read_tree_some(source_tree
, pathspec
);
98 for (pos
= 0; pathspec
[pos
]; pos
++)
100 ps_matched
= xcalloc(1, pos
);
102 for (pos
= 0; pos
< active_nr
; pos
++) {
103 struct cache_entry
*ce
= active_cache
[pos
];
104 pathspec_match(pathspec
, ps_matched
, ce
->name
, 0);
107 if (report_path_error(ps_matched
, pathspec
, 0))
110 /* Now we are committed to check them out */
111 memset(&state
, 0, sizeof(state
));
113 state
.refresh_cache
= 1;
114 for (pos
= 0; pos
< active_nr
; pos
++) {
115 struct cache_entry
*ce
= active_cache
[pos
];
116 if (pathspec_match(pathspec
, NULL
, ce
->name
, 0)) {
117 errs
|= checkout_entry(ce
, &state
, NULL
);
121 if (write_cache(newfd
, active_cache
, active_nr
) ||
122 commit_locked_index(lock_file
))
123 die("unable to write new index file");
125 resolve_ref("HEAD", rev
, 0, &flag
);
126 head
= lookup_commit_reference_gently(rev
, 1);
128 errs
|= post_checkout_hook(head
, head
, 0);
132 static void show_local_changes(struct object
*head
)
135 /* I think we want full paths, even if we're in a subdirectory. */
136 init_revisions(&rev
, NULL
);
138 rev
.diffopt
.output_format
|= DIFF_FORMAT_NAME_STATUS
;
139 add_pending_object(&rev
, head
, NULL
);
140 run_diff_index(&rev
, 0);
143 static void describe_detached_head(char *msg
, struct commit
*commit
)
147 parse_commit(commit
);
148 pretty_print_commit(CMIT_FMT_ONELINE
, commit
, &sb
, 0, NULL
, NULL
, 0, 0);
149 fprintf(stderr
, "%s %s... %s\n", msg
,
150 find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
), sb
.buf
);
154 struct checkout_opts
{
162 enum branch_track track
;
165 static int reset_tree(struct tree
*tree
, struct checkout_opts
*o
, int worktree
)
167 struct unpack_trees_options opts
;
168 struct tree_desc tree_desc
;
170 memset(&opts
, 0, sizeof(opts
));
172 opts
.update
= worktree
;
173 opts
.skip_unmerged
= !worktree
;
176 opts
.fn
= oneway_merge
;
177 opts
.verbose_update
= !o
->quiet
;
178 opts
.src_index
= &the_index
;
179 opts
.dst_index
= &the_index
;
181 init_tree_desc(&tree_desc
, tree
->buffer
, tree
->size
);
182 switch (unpack_trees(1, &tree_desc
, &opts
)) {
184 o
->writeout_error
= 1;
186 * We return 0 nevertheless, as the index is all right
187 * and more importantly we have made best efforts to
188 * update paths in the work tree, and we cannot revert
199 const char *name
; /* The short name used */
200 const char *path
; /* The full name of a real branch */
201 struct commit
*commit
; /* The named commit */
204 static void setup_branch_path(struct branch_info
*branch
)
207 strbuf_init(&buf
, 0);
208 strbuf_addstr(&buf
, "refs/heads/");
209 strbuf_addstr(&buf
, branch
->name
);
210 branch
->path
= strbuf_detach(&buf
, NULL
);
213 static int merge_working_tree(struct checkout_opts
*opts
,
214 struct branch_info
*old
, struct branch_info
*new)
217 struct lock_file
*lock_file
= xcalloc(1, sizeof(struct lock_file
));
218 int newfd
= hold_locked_index(lock_file
, 1);
222 ret
= reset_tree(new->commit
->tree
, opts
, 1);
226 struct tree_desc trees
[2];
228 struct unpack_trees_options topts
;
230 memset(&topts
, 0, sizeof(topts
));
232 topts
.src_index
= &the_index
;
233 topts
.dst_index
= &the_index
;
235 topts
.msgs
.not_uptodate_file
= "You have local changes to '%s'; cannot switch branches.";
237 refresh_cache(REFRESH_QUIET
);
239 if (unmerged_cache()) {
240 error("you need to resolve your current index first");
244 /* 2-way merge to the new branch */
247 topts
.gently
= opts
->merge
;
248 topts
.verbose_update
= !opts
->quiet
;
249 topts
.fn
= twoway_merge
;
250 topts
.dir
= xcalloc(1, sizeof(*topts
.dir
));
251 topts
.dir
->show_ignored
= 1;
252 topts
.dir
->exclude_per_dir
= ".gitignore";
253 tree
= parse_tree_indirect(old
->commit
->object
.sha1
);
254 init_tree_desc(&trees
[0], tree
->buffer
, tree
->size
);
255 tree
= parse_tree_indirect(new->commit
->object
.sha1
);
256 init_tree_desc(&trees
[1], tree
->buffer
, tree
->size
);
258 ret
= unpack_trees(2, trees
, &topts
);
261 * Unpack couldn't do a trivial merge; either
262 * give up or do a real merge, depending on
263 * whether the merge flag was used.
269 parse_commit(old
->commit
);
271 /* Do more real merge */
274 * We update the index fully, then write the
275 * tree from the index, then merge the new
276 * branch with the current tree, with the old
277 * branch as the base. Then we reset the index
278 * (but not the working tree) to the new
279 * branch, leaving the working tree as the
280 * merged version, but skipping unmerged
281 * entries in the index.
284 add_files_to_cache(NULL
, NULL
, 0);
285 work
= write_tree_from_memory();
287 ret
= reset_tree(new->commit
->tree
, opts
, 1);
290 merge_trees(new->commit
->tree
, work
, old
->commit
->tree
,
291 new->name
, "local", &result
);
292 ret
= reset_tree(new->commit
->tree
, opts
, 0);
298 if (write_cache(newfd
, active_cache
, active_nr
) ||
299 commit_locked_index(lock_file
))
300 die("unable to write new index file");
303 show_local_changes(&new->commit
->object
);
308 static void report_tracking(struct branch_info
*new)
310 struct strbuf sb
= STRBUF_INIT
;
311 struct branch
*branch
= branch_get(new->name
);
313 if (!format_tracking_info(branch
, &sb
))
315 fputs(sb
.buf
, stdout
);
319 static void update_refs_for_switch(struct checkout_opts
*opts
,
320 struct branch_info
*old
,
321 struct branch_info
*new)
324 const char *old_desc
;
325 if (opts
->new_branch
) {
326 create_branch(old
->name
, opts
->new_branch
, new->name
, 0,
327 opts
->new_branch_log
, opts
->track
);
328 new->name
= opts
->new_branch
;
329 setup_branch_path(new);
332 strbuf_init(&msg
, 0);
333 old_desc
= old
->name
;
335 old_desc
= sha1_to_hex(old
->commit
->object
.sha1
);
336 strbuf_addf(&msg
, "checkout: moving from %s to %s",
337 old_desc
, new->name
);
340 create_symref("HEAD", new->path
, msg
.buf
);
342 if (old
->path
&& !strcmp(new->path
, old
->path
))
343 fprintf(stderr
, "Already on \"%s\"\n",
346 fprintf(stderr
, "Switched to%s branch \"%s\"\n",
347 opts
->new_branch
? " a new" : "",
350 } else if (strcmp(new->name
, "HEAD")) {
351 update_ref(msg
.buf
, "HEAD", new->commit
->object
.sha1
, NULL
,
352 REF_NODEREF
, DIE_ON_ERR
);
355 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
);
356 describe_detached_head("HEAD is now at", new->commit
);
359 remove_branch_state();
360 strbuf_release(&msg
);
361 if (!opts
->quiet
&& (new->path
|| !strcmp(new->name
, "HEAD")))
362 report_tracking(new);
365 static int switch_branches(struct checkout_opts
*opts
, struct branch_info
*new)
368 struct branch_info old
;
369 unsigned char rev
[20];
371 memset(&old
, 0, sizeof(old
));
372 old
.path
= resolve_ref("HEAD", rev
, 0, &flag
);
373 old
.commit
= lookup_commit_reference_gently(rev
, 1);
374 if (!(flag
& REF_ISSYMREF
))
377 if (old
.path
&& !prefixcmp(old
.path
, "refs/heads/"))
378 old
.name
= old
.path
+ strlen("refs/heads/");
382 new->commit
= old
.commit
;
384 die("You are on a branch yet to be born");
385 parse_commit(new->commit
);
389 * If the new thing isn't a branch and isn't HEAD and we're
390 * not starting a new branch, and we want messages, and we
391 * weren't on a branch, and we're moving to a new commit,
392 * describe the old commit.
394 if (!new->path
&& strcmp(new->name
, "HEAD") && !opts
->new_branch
&&
395 !opts
->quiet
&& !old
.path
&& new->commit
!= old
.commit
)
396 describe_detached_head("Previous HEAD position was", old
.commit
);
400 fprintf(stderr
, "warning: You appear to be on a branch yet to be born.\n");
401 fprintf(stderr
, "warning: Forcing checkout of %s.\n", new->name
);
406 ret
= merge_working_tree(opts
, &old
, new);
410 update_refs_for_switch(opts
, &old
, new);
412 ret
= post_checkout_hook(old
.commit
, new->commit
, 1);
413 return ret
|| opts
->writeout_error
;
416 int cmd_checkout(int argc
, const char **argv
, const char *prefix
)
418 struct checkout_opts opts
;
419 unsigned char rev
[20];
421 struct branch_info
new;
422 struct tree
*source_tree
= NULL
;
423 struct option options
[] = {
424 OPT__QUIET(&opts
.quiet
),
425 OPT_STRING('b', NULL
, &opts
.new_branch
, "new branch", "branch"),
426 OPT_BOOLEAN('l', NULL
, &opts
.new_branch_log
, "log for new branch"),
427 OPT_SET_INT('t', "track", &opts
.track
, "track",
428 BRANCH_TRACK_EXPLICIT
),
429 OPT_BOOLEAN('f', NULL
, &opts
.force
, "force"),
430 OPT_BOOLEAN('m', NULL
, &opts
.merge
, "merge"),
434 memset(&opts
, 0, sizeof(opts
));
435 memset(&new, 0, sizeof(new));
437 git_config(git_default_config
, NULL
);
439 opts
.track
= git_branch_track
;
441 argc
= parse_options(argc
, argv
, options
, checkout_usage
,
442 PARSE_OPT_KEEP_DASHDASH
);
445 if (get_sha1(arg
, rev
))
447 else if ((new.commit
= lookup_commit_reference_gently(rev
, 1))) {
449 setup_branch_path(&new);
450 if (resolve_ref(new.path
, rev
, 1, NULL
))
451 new.commit
= lookup_commit_reference(rev
);
454 parse_commit(new.commit
);
455 source_tree
= new.commit
->tree
;
458 } else if ((source_tree
= parse_tree_indirect(rev
))) {
464 if (argc
&& !strcmp(argv
[0], "--")) {
469 if (!opts
.new_branch
&& (opts
.track
!= git_branch_track
))
470 die("git checkout: --track and --no-track require -b");
472 if (opts
.force
&& opts
.merge
)
473 die("git checkout: -f and -m are incompatible");
476 const char **pathspec
= get_pathspec(prefix
, argv
);
479 die("invalid path specification");
482 if (opts
.new_branch
|| opts
.force
|| opts
.merge
) {
484 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]);
486 die("git checkout: updating paths is incompatible with switching branches/forcing");
490 return checkout_paths(source_tree
, pathspec
);
493 if (new.name
&& !new.commit
) {
494 die("Cannot switch branch to a non-commit.");
497 return switch_branches(&opts
, &new);