Re: merge-recursive thinks symlink's child dirs are "real"

2019-09-17 Thread Elijah Newren
On Mon, Sep 16, 2019 at 5:09 PM Jonathan Nieder wrote: > > Jonathan Tan wrote: > > > This was raised by a coworker at $DAYJOB. I run the following script: > [reproduction recipe from (*) snipped] > > The cherry-pick must be manually resolved, when I would expect it to > > happen without needing us

Re: merge-recursive thinks symlink's child dirs are "real"

2019-09-17 Thread Elijah Newren
On Mon, Sep 16, 2019 at 3:15 PM SZEDER Gábor wrote: > > On Mon, Sep 16, 2019 at 02:47:07PM -0700, Jonathan Tan wrote: > > This was raised by a coworker at $DAYJOB. I run the following script: > > > > $GIT init test && cd test > > ln -s . foo > > mkdir bar && touch bar/file > > $GIT add foo

Re: merge-recursive thinks symlink's child dirs are "real"

2019-09-17 Thread Elijah Newren
On Mon, Sep 16, 2019 at 4:09 PM Jonathan Tan wrote: > > This was raised by a coworker at $DAYJOB. I run the following script: > > $GIT init test && cd test > ln -s . foo > mkdir bar && touch bar/file > $GIT add foo bar/file > $GIT commit -m "foo symlink" > > $GIT checkout -b branch1 >

Re: merge-recursive thinks symlink's child dirs are "real"

2019-09-16 Thread Jonathan Nieder
Jonathan Tan wrote: > This was raised by a coworker at $DAYJOB. I run the following script: [reproduction recipe from (*) snipped] > The cherry-pick must be manually resolved, when I would expect it to > happen without needing user intervention. > > You can see that at the point of the cherry-pick

Re: merge-recursive thinks symlink's child dirs are "real"

2019-09-16 Thread SZEDER Gábor
On Mon, Sep 16, 2019 at 02:47:07PM -0700, Jonathan Tan wrote: > This was raised by a coworker at $DAYJOB. I run the following script: > > $GIT init test && cd test > ln -s . foo > mkdir bar && touch bar/file > $GIT add foo bar/file > $GIT commit -m "foo symlink" > > $GIT checkout -b