Re: [PATCH v2] merge-recursive: restore accidentally dropped setting of path

2019-06-04 Thread Elijah Newren
On Tue, Jun 4, 2019 at 2:07 PM SZEDER Gábor wrote: > > On Tue, Jun 04, 2019 at 01:27:50PM -0700, Elijah Newren wrote: > > Changes since v1: > > * Minor tweaks suggested by SZEDER > > > diff --git a/t/t6042-merge-rename-corner-cases.sh > > b/t/t6042-merge-rename-corner-cases.sh > > index 09dfa8b

Re: [PATCH v2] merge-recursive: restore accidentally dropped setting of path

2019-06-04 Thread Junio C Hamano
SZEDER Gábor writes: >> +test_must_fail git merge-file \ >> +-L "HEAD" \ >> +-L "" \ >> +-L "A^0" \ >> +ours empty theirs && >> +git hash-object b >actual && >> +git hash-object our

Re: [PATCH v2] merge-recursive: restore accidentally dropped setting of path

2019-06-04 Thread SZEDER Gábor
On Tue, Jun 04, 2019 at 01:27:50PM -0700, Elijah Newren wrote: > Changes since v1: > * Minor tweaks suggested by SZEDER > diff --git a/t/t6042-merge-rename-corner-cases.sh > b/t/t6042-merge-rename-corner-cases.sh > index 09dfa8bd92..3fe2cd91dc 100755 > --- a/t/t6042-merge-rename-corner-cases.sh

[PATCH v2] merge-recursive: restore accidentally dropped setting of path

2019-06-04 Thread Elijah Newren
In commit 8daec1df03de ("merge-recursive: switch from (oid,mode) pairs to a diff_filespec", 2019-04-05), we actually switched from (oid,mode,path) triplets to a diff_filespec -- but most callsites in the patch only needed to worry about oid and mode so the commit message focused on that. The overs