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

Fix read-tree not to discard errors 

This fixes the issue identified with recently added tests to t1004

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2008-03-18 22:01:28 -07:00
parent 8a785dc921
commit c4758d3c93
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t1004-read-tree-m-u-wf.sh
View File

@ -177,7 +177,7 @@ test_expect_success 'funny symlink in work tree' '


' '


test_expect_failure 'funny symlink in work tree, un-unlink-able' ' test_expect_success 'funny symlink in work tree, un-unlink-able' '


rm -fr a b && rm -fr a b &&
git reset --hard && git reset --hard &&

9
unpack-trees.c
View File

@ -54,13 +54,14 @@ static void unlink_entry(char *name, char *last_symlink)
} }


static struct checkout state; static struct checkout state;
static void check_updates(struct unpack_trees_options *o) static int check_updates(struct unpack_trees_options *o)
{ {
unsigned cnt = 0, total = 0; unsigned cnt = 0, total = 0;
struct progress *progress = NULL; struct progress *progress = NULL;
char last_symlink[PATH_MAX]; char last_symlink[PATH_MAX];
struct index_state *index = &o->result; struct index_state *index = &o->result;
int i; int i;
int errs = 0;


if (o->update && o->verbose_update) { if (o->update && o->verbose_update) {
for (total = cnt = 0; cnt < index->cache_nr; cnt++) { for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
@ -90,12 +91,13 @@ static void check_updates(struct unpack_trees_options *o)
if (ce->ce_flags & CE_UPDATE) { if (ce->ce_flags & CE_UPDATE) {
ce->ce_flags &= ~CE_UPDATE; ce->ce_flags &= ~CE_UPDATE;
if (o->update) { if (o->update) {
checkout_entry(ce, &state, NULL); errs |= checkout_entry(ce, &state, NULL);
*last_symlink = '\0'; *last_symlink = '\0';
} }
} }
} }
stop_progress(&progress); stop_progress(&progress);
return errs != 0;
} }


static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o) static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
@ -369,7 +371,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
return unpack_failed(o, "Merge requires file-level merging"); return unpack_failed(o, "Merge requires file-level merging");


o->src_index = NULL; o->src_index = NULL;
check_updates(o); if (check_updates(o))
return -1;
if (o->dst_index) if (o->dst_index)
*o->dst_index = o->result; *o->dst_index = o->result;
return 0; return 0;