Re: [PATCH v5] contrib/subtree: fix "subtree split" skipped-merge bug

David Ware [off-list ref] writes:

On Thu, Jan 14, 2016 at 4:12 PM, David A. Greene [off-list ref] wrote:

quoted

David Ware [off-list ref] writes:

quoted

The commit was made against v2.6.3, when I try to apply the patch
against master it fails.

Any ideas why?

"git am" (a command I have never used before) Fails like so

Applying: contrib/subtree: fix "subtree split" skipped-merge bug
error: patch failed: contrib/subtree/t/t7900-subtree.sh:468
error: contrib/subtree/t/t7900-subtree.sh: patch does not apply

Oh I'm sorry, I misunderstood.  I thought you meant that the patch
applied but the test failed.

It doesn't even put any files into a conflict state.
I guess it's because of the hefty test refactoring you mentioned.

You should be able to just paste your new test right to the end of the
updated test file.  The tests were refactored to make each test
independent of the other.  There's no functionality change at all.

quoted

Re-checking the patch submission guidelines, it looks like bugfixes
should be based against maint.  I did that and the test still fails with
your changes.  It seems like we ought to rebase to maint and continue
our investigation there.

Hmm, the patch fails to apply for me there also. Same issue with
contrib/subtree/t/t7900-subtree.sh

I haven't worked with mailed patches at all before, so it is possible
I'm not using the correct workflow (I just saved the raw email I
received for the patch as txt and fed it to 'git am').
Cherrypicking the commit onto maint works fine though, and the test
passes for me in this situation.

Ok, that's probably just fine.  I've not used git-am myself either.

quoted

quoted

The process I'm using to run the tests is a little strange though, it
seems I have to make git, then make contrib/subtree, then cp
git-subtree to the root before running the Makefile on the tests.  Let
me know if there's a less strange process for running the subtree
tests.

I actually have an update that makes this easier but I haven't submitted
it yet.  But yes, you've got the current process right.

That will be nice.

I submitted it yesterday.  Might take another round and then a few days
to get it in.  I believe it would go into master since it's a new
"feature" in the Makefile.

I've rewritten the test to use the repo/commit creation methods, and
renamed that branch. I've also added the comments you requested, and
changed the push to an ancestor check.
I'll be submitting the new version of the patch shortly.

Thank you!

                    -David