Re: [PATCH/RFC 1/3] t3030-merge-recursive: Test known breakage with empty work tree

2014-01-24 Thread Brad King
On 01/24/2014 11:51 AM, Jonathan Nieder wrote: > a quick summary of the symptoms and when it came up? You're suggested commit message correctly explains it: > Do you mean something like the following? > > Sometimes when working with a large repository it can be useful to > try out a

Re: [PATCH/RFC 1/3] t3030-merge-recursive: Test known breakage with empty work tree

2014-01-24 Thread Jonathan Nieder
Hi, Brad King wrote: > Add test cases that use 'merge-recursive' plumbing with a temporary > index and empty work tree. Populate the index using 'read-tree' and > 'update-index --ignore-missing --refresh' to prepare for merge without > actually checking all files out to disk. Verify that each m

[PATCH/RFC 1/3] t3030-merge-recursive: Test known breakage with empty work tree

2014-01-24 Thread Brad King
Add test cases that use 'merge-recursive' plumbing with a temporary index and empty work tree. Populate the index using 'read-tree' and 'update-index --ignore-missing --refresh' to prepare for merge without actually checking all files out to disk. Verify that each merge produces its expected tree