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

identical parent. Also, add a test case which checks that a descendant can be pushed to its ancestor in this case. Signed-off-by: Dave Ware --- Notes: Many thanks to Eric Sunshine and Junio Hamano for adivce on this patch Changes since v4 - Minor spelling and style fixes to

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

identical parent. Also, add a test case which checks that a descendant can be pushed to its ancestor in this case. Signed-off-by: Dave Ware --- Notes: Many thanks to Eric Sunshine and Junio Hamano for adivce on this patch Changes since v3: - Improvements to commit message

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

tor of the identical parent. Also, add a test case which checks that a descendant can be pushed to its ancestor in this case. Signed-off-by: Dave Ware --- Notes: Many thanks to Eric Sunshine for his adivce on this patch Changes since v2: - Minor improvements to commit message - Cha

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

tor of the identical parent. Also adding a test case, this checks that a descendant can be pushed to it's ancestor in this case. Signed-off-by: Dave Ware --- contrib/subtree/git-subtree.sh | 12 +++-- contrib/subtree/t/t7900-subtree.sh | 52 ++ 2 fi