unpack-trees: let merged_entry() pass through do_add_entry()'s errors

dscho · dscho · commit cc756edda637 · 2019-12-05T15:37:06.000+01:00
A `git clone` will end with exit code 0 when `merged_entry()` returns a
positive value during a call of `unpack_trees()` to `traverse_trees()`.
The reason is that `unpack_trees()` will interpret a positive value not
to be an error.

The problem is, however, that `add_index_entry()` (which is called by
`merged_entry()` can report an error, and we really should fail the
entire clone in such a case.

Let's fix this problem, in preparation for a Windows-specific patch
disallowing `mkdir()` with directory names that contain a trailing space
(which is illegal on NTFS): we want `git clone` to abort when a path
cannot be checked out due to that condition.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -1821,7 +1821,8 @@ static int merged_entry(const struct cache_entry *ce,
 		invalidate_ce_path(old, o);
 	}
 
-	do_add_entry(o, merge, update, CE_STAGEMASK);
+	if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)
+		return -1;
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1821,7 +1821,8 @@ static int merged_entry(const struct cache_entry *ce,`
`1821`	`1821`	`invalidate_ce_path(old, o);`
`1822`	`1822`	`}`
`1823`	`1823`
`1824`		`- do_add_entry(o, merge, update, CE_STAGEMASK);`
	`1824`	`+ if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)`
	`1825`	`+ return -1;`
`1825`	`1826`	`return 1;`
`1826`	`1827`	`}`
`1827`	`1828`