kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin-checkout.c: check error return from read_cache() 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2008-12-05 17:54:10 -08:00
parent f371d3ea3c
commit b96524f83a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin-checkout.c
View File

@ -228,7 +228,8 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec,
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));


newfd = hold_locked_index(lock_file, 1); newfd = hold_locked_index(lock_file, 1);
read_cache(); if (read_cache() < 0)
return error("corrupt index file");


if (source_tree) if (source_tree)
read_tree_some(source_tree, pathspec); read_tree_some(source_tree, pathspec);
@ -371,7 +372,9 @@ static int merge_working_tree(struct checkout_opts *opts,
int ret; int ret;
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
int newfd = hold_locked_index(lock_file, 1); int newfd = hold_locked_index(lock_file, 1);
read_cache();
if (read_cache() < 0)
return error("corrupt index file");


if (opts->force) { if (opts->force) {
ret = reset_tree(new->commit->tree, opts, 1); ret = reset_tree(new->commit->tree, opts, 1);