diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-27 14:45:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 22:31:30 (GMT) |
| commit | 6e2068ae48000a2dfdb2044bbb91073c11f6fbff (patch) | |
| tree | e5af6529e9e806d99ff89d41f1682c921cb345b6 /git.rc | |
| parent | 257627268ad19cb616ad3feb6ca8171d400df287 (diff) | |
| download | git-6e2068ae48000a2dfdb2044bbb91073c11f6fbff.zip git-6e2068ae48000a2dfdb2044bbb91073c11f6fbff.tar.gz git-6e2068ae48000a2dfdb2044bbb91073c11f6fbff.tar.bz2 | |
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 'git.rc')
0 files changed, 0 insertions, 0 deletions