diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-06 01:54:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-08 03:08:15 (GMT) |
| commit | b96524f83aa6ba7bd08fb59bb0aa07453a984a8d (patch) | |
| tree | 750c820ac8f05d7f90636401a85919943e240dfd /builtin-checkout.c | |
| parent | f371d3ea3ca7933df787230f2eb9b67901bde9d3 (diff) | |
| download | git-b96524f83aa6ba7bd08fb59bb0aa07453a984a8d.zip git-b96524f83aa6ba7bd08fb59bb0aa07453a984a8d.tar.gz git-b96524f83aa6ba7bd08fb59bb0aa07453a984a8d.tar.bz2 | |
builtin-checkout.c: check error return from read_cache()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 7f3bd7b..c2c0561 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -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)); newfd = hold_locked_index(lock_file, 1); - read_cache(); + if (read_cache() < 0) + return error("corrupt index file"); if (source_tree) read_tree_some(source_tree, pathspec); @@ -371,7 +372,9 @@ static int merge_working_tree(struct checkout_opts *opts, int ret; struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); int newfd = hold_locked_index(lock_file, 1); - read_cache(); + + if (read_cache() < 0) + return error("corrupt index file"); if (opts->force) { ret = reset_tree(new->commit->tree, opts, 1); |