merge-recursive.c: tolerate missing files while refreshing index
Teach add_cacheinfo to tell make_cache_entry to skip refreshing stat information when a file is missing from the work tree. We do not want the index to be stat-dirty after the merge but also do not want to fail when a file happens to be missing. This fixes the 'merge-recursive w/ empty work tree - ours has rename' case in t3030-merge-recursive. Suggested-by: Elijah Newren <newren@gmail.com> Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brad King committed
Jan 27, 2014 at 09:45 UTC
6e2068ae48000a2dfdb2044bbb91073c11f6fbff
2 files changed
+3
-2
merge-recursive.c
+2
-1
@@ -202,7 +202,8 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
202
{
203
struct cache_entry *ce;
204
ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage,
205
- (refresh ? CE_MATCH_REFRESH : 0 ));
205
+ (refresh ? (CE_MATCH_REFRESH |
206
+ CE_MATCH_IGNORE_MISSING) : 0 ));
207
if (!ce)
208
return error(_("addinfo_cache failed for path '%s'"), path);
209
return add_cache_entry(ce, options);
t/t3030-merge-recursive.sh
+1
-1
@@ -518,7 +518,7 @@ test_expect_success 'reset and bind merge' '
518
519
'
520
521
-test_expect_failure 'merge-recursive w/ empty work tree - ours has rename' '
521
+test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
522
(
523
GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
524
export GIT_WORK_TREE &&