From: David A. Greene Date: Mon, 18 Feb 2013 20:56:46 GMT Subject: [PATCH 1/8] contrib/subtree: Use %B for split subject/body Message-ID: <1361221013-12756-2-git-send-email-greened@obbligato.org> In-Reply-To: <1361221013-12756-1-git-send-email-greened@obbligato.org> From: Techlive Zheng 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 Signed-off-by: David A. Greene --- 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