| commit | 156d6ed9221ff38c4cd3bfcfc6778e31c104fd9b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Feb 2014 22:01:14 +0000 (27 14:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Feb 2014 22:01:14 +0000 (27 14:01 -0800) | ||
| tree | d1e4e06d6b9f304bc1ce2deacd555183131d2be1 | treesnapshot (tar.gz zip) |
| parent | 7da5fd6895af9066ad4684e333c57f4086589c2f | commitdiff |
| parent | 6e2068ae48000a2dfdb2044bbb91073c11f6fbff | commitdiff |
Merge branch 'bk/refresh-missing-ok-in-merge-recursive'
Allow "merge-recursive" to work in an empty (temporary) working
tree again when there are renames involved, correcting an old
regression in 1.7.7 era.
* 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
Allow "merge-recursive" to work in an empty (temporary) working
tree again when there are renames involved, correcting an old
regression in 1.7.7 era.
* 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 |