| commit | 6d011b8e3f36fc5b41d2451f488067ee367d7084 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 21:02:37 +0000 (18 14:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 21:02:38 +0000 (18 14:02 -0700) | ||
| tree | efaf523a867e7689c8fc6cfb4b7a223d8cd9028b | treesnapshot (tar.gz zip) |
| parent | c7b317320c1301b6bcf4eb4ac824b76114068f11 | commitdiff |
| parent | 6e2068ae48000a2dfdb2044bbb91073c11f6fbff | commitdiff |
Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint
"merge-recursive" was broken in 1.7.7 era and stopped working in an
empty (temporary) working tree, when there are renames involved.
This has been corrected.
* bk/refresh-missing-ok-in-merge-recursive:
merge-recursive.c: tolerate missing files while refreshing index
read-cache.c: extend make_cache_entry refresh flag with options
read-cache.c: refactor --ignore-missing implementation
t3030-merge-recursive: test known breakage with empty work tree
"merge-recursive" was broken in 1.7.7 era and stopped working in an
empty (temporary) working tree, when there are renames involved.
This has been corrected.
* bk/refresh-missing-ok-in-merge-recursive:
merge-recursive.c: tolerate missing files while refreshing index
read-cache.c: extend make_cache_entry refresh flag with options
read-cache.c: refactor --ignore-missing implementation
t3030-merge-recursive: test known breakage with empty work tree
| cache.h | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |
| read-cache.c | diff1 | diff2 | blobhistory |