[PATCH 1/8] contrib/subtree: Use %B for split subject/body
From: David A. Greene <hidden>
Date: 2016-06-15 22:56:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Techlive Zheng <redacted> Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng <redacted> Signed-off-by: David A. Greene <redacted> --- contrib/subtree/t/t7900-subtree.sh | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 80d3399..8dd6a82 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh@@ -226,6 +226,17 @@ test_expect_success 'check hash of split' ' check_equal ''"$new_hash"'' "$subdir_hash" ' +test_expect_success 'check hash of split' ' + spl1=$(git subtree split --prefix subdir) && + undo && + git subtree split --prefix subdir --branch splitbr1test && + check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" + git checkout splitbr1test && + new_hash=$(git rev-parse HEAD~2) && + git checkout mainline && + check_equal ''"$new_hash"'' "$subdir_hash" +' + test_expect_success 'check split with --branch for an existing branch' ' spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' && undo &&
--
1.7.10.4