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

diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index a0baf6e8b09f958a9c768a2282b1caab1058a15b..537787e598b414886316d497c0076d517a654be8 100755 (executable)
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -436,10 +436,6 @@ test_expect_success 'verify --[no-]ahead-behind with V2 format' '
                git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
                test_cmp expect actual &&
 
-               # Confirmat that "status.aheadbehind" works on V2 format.
-               git -c status.aheadbehind=false status --porcelain=v2 --branch --untracked-files=all >actual &&
-               test_cmp expect actual &&
-
                # Confirm --ahead-behind reports traditional branch.ab with 1/0.
                cat >expect <<-EOF &&
                # branch.oid $HUF
@@ -449,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
        )
 '