path: root/t
diff options
authorBrad King <>2014-01-27 14:45:09 (GMT)
committerJunio C Hamano <>2014-02-24 22:31:30 (GMT)
commit6e2068ae48000a2dfdb2044bbb91073c11f6fbff (patch)
treee5af6529e9e806d99ff89d41f1682c921cb345b6 /t
parent257627268ad19cb616ad3feb6ca8171d400df287 (diff)
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 <> Signed-off-by: Brad King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't')
1 files changed, 1 insertions, 1 deletions
diff --git a/t/ b/t/
index 3db3bf6..82e1854 100755
--- a/t/
+++ b/t/
@@ -518,7 +518,7 @@ test_expect_success 'reset and bind merge' '
-test_expect_failure 'merge-recursive w/ empty work tree - ours has rename' '
+test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
export GIT_WORK_TREE &&