Merge branch 'rm/gpg-program-doc-fix'

diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index b9a86d3347acb4051a212e2c9e3573a2c6e9fe7a..537787e598b414886316d497c0076d517a654be8 100755 (executable)
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -364,11 +364,8 @@ test_expect_success 'verify upstream fields in branch header' '
                test_cmp expect actual &&
 
                ## Repeat the above but without --branch.
-               cat >expect <<-EOF &&
-               EOF
-
                git status --porcelain=v2 --untracked-files=all >actual &&
-               test_cmp expect actual &&
+               test_must_be_empty actual &&
 
                ## Test upstream-gone case. Fake this by pointing origin/master at
                ## a non-existing commit.
@@ -448,6 +445,14 @@ test_expect_success 'verify --[no-]ahead-behind with V2 format' '
                EOF
 
                git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+               test_cmp expect actual &&
+
+               # Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+               git -c status.aheadbehind=false status --porcelain=v2 --branch --untracked-files=all >actual &&
+               test_cmp expect actual &&
+
+               # Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+               git -c status.aheadbehind=true status --porcelain=v2 --branch --untracked-files=all >actual &&
                test_cmp expect actual
        )
 '