git-commit-vandalism/contrib/subtree
Dave Ware 933cfeb90b contrib/subtree: fix "subtree split" skipped-merge bug
'git subtree split' can incorrectly skip a merge even when both parents
act on the subtree, provided the merge results in a tree identical to
one of the parents. Fix by copying the merge if at least one parent is
non-identical, and the non-identical parent is not an ancestor of the
identical parent.

Also, add a test case which checks that a descendant remains a
descendent on the subtree in this case.

Signed-off-by: Dave Ware <davidw@realtimegenomics.com>
Reviewed-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-01-20 14:53:18 -08:00
..
t contrib/subtree: fix "subtree split" skipped-merge bug 2016-01-20 14:53:18 -08:00
.gitignore subtree: add an install-html target 2014-10-15 15:17:08 -07:00
COPYING Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00
git-subtree.sh contrib/subtree: fix "subtree split" skipped-merge bug 2016-01-20 14:53:18 -08:00
git-subtree.txt contrib/subtree: there's no push --squash 2015-05-07 11:03:32 -07:00
INSTALL Fix git-subtree install instructions 2012-04-09 22:26:19 -05:00
Makefile subtree: add an install-html target 2014-10-15 15:17:08 -07:00
README Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00
todo contrib/subtree: remove "push" command from the "todo" file 2015-11-06 09:32:33 -08:00

Please read git-subtree.txt for documentation.

Please don't contact me using github mail; it's slow, ugly, and worst of
all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to
help.

Avery