Re: [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick

2016-11-17 Thread Junio C Hamano
David Turner writes: > diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh > index 470f334..be074a1 100755 > --- a/t/t3030-merge-recursive.sh > +++ b/t/t3030-merge-recursive.sh > @@ -575,13 +575,13 @@ test_expect_success 'merge removes empty directories' ' > test_must_fail

Re: [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick

2016-11-07 Thread Stefan Beller
On Mon, Nov 7, 2016 at 12:38 PM, David Turner wrote: >> -Original Message- >> From: Stefan Beller [mailto:sbel...@google.com] >> Sent: Monday, November 07, 2016 2:14 PM >> To: David Turner >> Cc: git@vger.kernel.org >> Subject: Re: [PATCH] submodul

RE: [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick

2016-11-07 Thread David Turner
> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Monday, November 07, 2016 2:14 PM > To: David Turner > Cc: git@vger.kernel.org > Subject: Re: [PATCH] submodules: allow empty working-tree dirs in > merge/cherry-pick > > On Mon, Nov

Re: [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick

2016-11-07 Thread Stefan Beller
On Mon, Nov 7, 2016 at 10:31 AM, David Turner wrote: > When a submodule is being merged or cherry-picked into a working > tree that already contains a corresponding empty directory, do not > record a conflict. > > One situation where this bug appears is: > > - Commit 1 adds a submodule "... at su

[PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick

2016-11-07 Thread David Turner
When a submodule is being merged or cherry-picked into a working tree that already contains a corresponding empty directory, do not record a conflict. One situation where this bug appears is: - Commit 1 adds a submodule - Commit 2 removes that submodule and re-adds it into a subdirectory (