Merge branch 'js/default-branch-name'

[thirdparty/git.git] / contrib / subtree / t / t7900-subtree.sh

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 57ff4b25c17e5479e9dc058fd723d44faa23877b..53d7accf949fef1882f051805570a4797e46de3f 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -196,7 +196,8 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
                cd "$subtree_test_count" &&
                git fetch ./"sub proj" master &&
                git subtree merge --prefix="sub dir" FETCH_HEAD &&
-               check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
+               check_equal "$(last_commit_message)" \
+                       "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
        )
 '
 
@@ -273,7 +274,8 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
                cd "$test_count" &&
                git fetch ./subproj master &&
                git subtree merge --prefix=subdir/ FETCH_HEAD &&
-               check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
+               check_equal "$(last_commit_message)" \
+                       "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
        )
 '