Re: git-subtree: directory mismatch

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 25, 2009, 20:20 UTC
Message-ID: <7vpr76uzju.fsf@alter.siamese.dyndns.org>
In-Reply-To: <32541b130911251148v70a5dc77k9936881d0b382ec2@mail.gmail.com>

Avery Pennarun <apenwarr@gmail.com> writes:

>> Look at http://github.com/gitster/git/commits/jc/merge-theirs/
>
> I also tried simply searching for things like 'git "-xsubtree"' in
> google, with no luck.  But thanks for the link.

I didn't _find_ the link ;-) I just pushed it out a few minutes ago, after looking for strings that appear in messages of these commits. The series was done over a few weeks, and would have been very painful to find from the gmane archive.

> - What was the reason this never got merged?  What changes are needed
> to rectify that?

I do not remember there was any real reason. I do remember some people didn't like -X<option> syntax but I don't think there was any solid counterproposal to achieve a similar goal to satisfy the need to pass arbitrary parameters to the merge strategy backends.

> - Considering the earlier discussion, do we want to leave out the
> actual -Xtheirs feature and just have -Xours and -Xsubtree?

Both -Xtheirs and -Xours have the same degree of badness in the context of "source code management", but there was a real-world use case that would have benefitted from -Xours recently.

  cf. http://thread.gmane.org/gmane.comp.version-control.git/131902/focus=132920

If -Xours goes in, so should -Xtheirs, I think, because Peter's "web tree" example could merge in both ways (i.e. he could be pulling from web tree into his private area and then cleaning things up before pushing the result back).

> - If I rebase them and the changes turn out to be minimal, do they
> still need a signed-off-by Junio?

"minimal" by definition means that you ased your work on mine and I still have the copyright to the change as a co-author together with you. We both need to certify that the change is made under DCO.