Merge branch 'maint-2.34' into maint-2.35

[thirdparty/git.git] / t / t4205-log-pretty-formats.sh

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index c66db6391f3a0af64e17208e42f8936f7c9d982d..fedb7ca7493f650ce9def7179cf63fa11ef90d70 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -976,7 +976,7 @@ test_expect_success '%(describe) vs git describe' '
                else
                        : >expect-contains-bad
                fi &&
-               echo "$hash $desc"
+               echo "$hash $desc" || return 1
        done >expect &&
        test_path_exists expect-contains-good &&
        test_path_exists expect-contains-bad &&
@@ -1002,6 +1002,22 @@ test_expect_success '%(describe:exclude=...) vs git describe --exclude ...' '
        test_cmp expect actual
 '
 
+test_expect_success '%(describe:tags) vs git describe --tags' '
+       test_when_finished "git tag -d tagname" &&
+       git tag tagname &&
+       git describe --tags >expect &&
+       git log -1 --format="%(describe:tags)" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '%(describe:abbrev=...) vs git describe --abbrev=...' '
+       test_when_finished "git tag -d tagname" &&
+       git tag -a -m tagged tagname &&
+       git describe --abbrev=15 >expect &&
+       git log -1 --format="%(describe:abbrev=15)" >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'log --pretty with space stealing' '
        printf mm0 >expect &&
        git log -1 --pretty="format:mm%>>|(1)%x30" >actual &&