move "%G" format test from t7510 to t6006

The final test in t7510 checks that "--format" placeholders
that look similar to GPG placeholders (but that we don't
actually understand) are passed through. That test was
placed in t7510, since the other GPG placeholder tests are
there. However, it does not have a GPG prerequisite, because
it is not actually checking any signed commits.

This causes the test to erroneously fail when gpg is not
installed on a system, however. Not because we need signed
commits, but because we need _any_ commit to run "git log".
If we don't have gpg installed, t7510 doesn't create any
commits at all.

We can fix this by moving the test into t6006. This is
arguably a better place anyway, because it is where we test
most of the other placeholders (we do not test GPG
placeholders there because of the infrastructure needed to
make signed commits).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 9d9d9de08e1926525c24fc01c1217a96964fa1ee..9ab20ee09d60f2c6c8deae9f34ab21c557e6d9b6 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -394,4 +394,10 @@ test_expect_success 'single-character name is parsed correctly' '
        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

+test_expect_success 'unused %G placeholders are passed through' '
+       echo "%GX %G" >expect &&
+       git log -1 --format="%GX %G" >actual &&
+       test_cmp expect actual
+'
+

 test_done
 test_done

diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 9810242435b40682c6cfa67e926590145b688ac9..e97477a3b98a49c80ce01f06b966eacff52a3bd1 100755 (executable)
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -147,10 +147,4 @@ test_expect_success GPG 'show lack of signature with custom format' '
        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

-test_expect_success 'unused %G placeholders are passed through' '
-       echo "%GX %G" >expect &&
-       git log -1 --format="%GX %G" >actual &&
-       test_cmp expect actual
-'
-

 test_done
 test_done