diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-27 09:45:09 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 14:31:30 -0800 |
| commit | 6e2068ae48000a2dfdb2044bbb91073c11f6fbff (patch) | |
| tree | e5af6529e9e806d99ff89d41f1682c921cb345b6 /t/t3030-merge-recursive.sh | |
| parent | 257627268ad19cb616ad3feb6ca8171d400df287 (diff) | |
| download | git-6e2068ae48000a2dfdb2044bbb91073c11f6fbff.tar.gz git-6e2068ae48000a2dfdb2044bbb91073c11f6fbff.tar.xz | |
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>
Diffstat (limited to 't/t3030-merge-recursive.sh')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 3db3bf665..82e18548c 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -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 && |