From: Junio C Hamano Date: Tue, 18 Mar 2014 21:02:37 +0000 (-0700) Subject: Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint X-Git-Tag: v1.9.1~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d011b8e3f36fc5b41d2451f488067ee367d7084 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 --- 6d011b8e3f36fc5b41d2451f488067ee367d7084