Re: [PATCH 1/2] t1015: demonstrate directory/file conflict recovery failures

2018-07-11 Thread Elijah Newren
Hi Eric, On Wed, Jul 11, 2018 at 2:21 AM, Eric Sunshine wrote: > On Tue, Jul 10, 2018 at 10:18:33PM -0700, Elijah Newren wrote: >> Several "recovery" commands outright fail or do not fully recover >> when directory-file conflicts are present. This includes: >> * git read-tree --reset HEAD >>

Re: [PATCH 1/2] t1015: demonstrate directory/file conflict recovery failures

2018-07-11 Thread Eric Sunshine
On Tue, Jul 10, 2018 at 10:18:33PM -0700, Elijah Newren wrote: > Several "recovery" commands outright fail or do not fully recover > when directory-file conflicts are present. This includes: > * git read-tree --reset HEAD > * git am --skip > * git am --abort > * git merge --abort > * git

[PATCH 1/2] t1015: demonstrate directory/file conflict recovery failures

2018-07-10 Thread Elijah Newren
Several "recovery" commands outright fail or do not fully recover when directory-file conflicts are present. This includes: * git read-tree --reset HEAD * git am --skip * git am --abort * git merge --abort * git reset --hard Add testcases documenting these shortcomings. Signed-off-by: