diff options
| author | Dave Ware <davidw@realtimegenomics.com> | 2016-01-15 00:41:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-20 22:53:18 (GMT) |
| commit | 933cfeb90b5d03b4096db6d60494a6eedea25d03 (patch) | |
| tree | a916e337fe8deb41761d87c2219f240914239997 /builtin | |
| parent | 30fe9b2f9aece7f8f24bc069b9d7470b8291535e (diff) | |
| download | git-933cfeb90b5d03b4096db6d60494a6eedea25d03.zip git-933cfeb90b5d03b4096db6d60494a6eedea25d03.tar.gz git-933cfeb90b5d03b4096db6d60494a6eedea25d03.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions