Merge branch 'gp/gitweb'

[git.git] / t / t7501-commit.sh

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 21dcf550fc89781bc1d2aee2d39d3f563d7ebdc7..c0288f345fb5809d8606f4d3cfaf73d24d6c7281 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -203,7 +203,7 @@ test_expect_success 'sign off (1)' '
                git var GIT_COMMITTER_IDENT |
                sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
        ) >expected &&
-       diff -u expected actual
+       test_cmp expected actual
 
 '
 
@@ -223,7 +223,7 @@ $existing" &&
                git var GIT_COMMITTER_IDENT |
                sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
        ) >expected &&
-       diff -u expected actual
+       test_cmp expected actual
 
 '
 
@@ -240,7 +240,7 @@ test_expect_success 'multiple -m' '
                echo
                echo three
        ) >expected &&
-       diff -u expected actual
+       test_cmp expected actual
 
 '
 
@@ -301,12 +301,12 @@ test_expect_success 'same tree (merge and amend merge)' '
        git merge -s ours side -m "empty ok" &&
        git diff HEAD^ HEAD >actual &&
        : >expected &&
-       diff -u expected actual &&
+       test_cmp expected actual &&
 
        git commit --amend -m "empty really ok" &&
        git diff HEAD^ HEAD >actual &&
        : >expected &&
-       diff -u expected actual
+       test_cmp expected actual
 
 '
 
@@ -323,7 +323,25 @@ test_expect_success 'amend using the message from another commit' '
        git commit --allow-empty --amend -C "$old" &&
        git show --pretty="format:%ad %s" "$old" >expected &&
        git show --pretty="format:%ad %s" HEAD >actual &&
-       diff -u expected actual
+       test_cmp expected actual
+
+'
+
+test_expect_success 'amend using the message from a commit named with tag' '
+
+       git reset --hard &&
+       test_tick &&
+       git commit --allow-empty -m "old commit" &&
+       old=$(git rev-parse --verify HEAD) &&
+       git tag -a -m "tag on old" tagged-old HEAD &&
+       test_tick &&
+       git commit --allow-empty -m "new commit" &&
+       new=$(git rev-parse --verify HEAD) &&
+       test_tick &&
+       git commit --allow-empty --amend -C tagged-old &&
+       git show --pretty="format:%ad %s" "$old" >expected &&
+       git show --pretty="format:%ad %s" HEAD >actual &&
+       test_cmp expected actual
 
 '