l10n: zh_CN: Revision for git v2.21.0 l10n

diff --git a/t/t5573-pull-verify-signatures.sh b/t/t5573-pull-verify-signatures.sh
index 8ae331f40ed9e7c83dd91c35278b5dc2f5326a29..3e9876e1971348daad7fd87f8aa107ea5fd6aaff 100755 (executable)
--- a/t/t5573-pull-verify-signatures.sh
+++ b/t/t5573-pull-verify-signatures.sh
@@ -29,7 +29,7 @@ test_expect_success GPG 'create repositories with signed commits' '
                echo 4 >d && git add d &&
                test_tick && git commit -S -m "bad" &&
                git cat-file commit HEAD >raw &&
-               sed -e "s/bad/forged bad/" raw >forged &&
+               sed -e "s/^bad/forged bad/" raw >forged &&
                git hash-object -w -t commit forged >forged.commit &&
                git checkout $(cat forged.commit)
        ) &&
@@ -43,36 +43,46 @@ test_expect_success GPG 'create repositories with signed commits' '
 '
 
 test_expect_success GPG 'pull unsigned commit with --verify-signatures' '
+       test_when_finished "git reset --hard && git checkout initial" &&
        test_must_fail git pull --ff-only --verify-signatures unsigned 2>pullerror &&
        test_i18ngrep "does not have a GPG signature" pullerror
 '
 
 test_expect_success GPG 'pull commit with bad signature with --verify-signatures' '
+       test_when_finished "git reset --hard && git checkout initial" &&
        test_must_fail git pull --ff-only --verify-signatures bad 2>pullerror &&
        test_i18ngrep "has a bad GPG signature" pullerror
 '
 
 test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures' '
+       test_when_finished "git reset --hard && git checkout initial" &&
        test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
        test_i18ngrep "has an untrusted GPG signature" pullerror
 '
 
 test_expect_success GPG 'pull signed commit with --verify-signatures' '
-       test_when_finished "git checkout initial" &&
+       test_when_finished "git reset --hard && git checkout initial" &&
        git pull --verify-signatures signed >pulloutput &&
        test_i18ngrep "has a good GPG signature" pulloutput
 '
 
 test_expect_success GPG 'pull commit with bad signature without verification' '
-       test_when_finished "git checkout initial" &&
+       test_when_finished "git reset --hard && git checkout initial" &&
        git pull --ff-only bad 2>pullerror
 '
 
 test_expect_success GPG 'pull commit with bad signature with --no-verify-signatures' '
-       test_when_finished "git checkout initial" &&
+       test_when_finished "git reset --hard && git checkout initial" &&
        test_config merge.verifySignatures true &&
        test_config pull.verifySignatures true &&
        git pull --ff-only --no-verify-signatures bad 2>pullerror
 '
 
+test_expect_success GPG 'pull unsigned commit into unborn branch' '
+       git init empty-repo &&
+       test_must_fail \
+               git -C empty-repo pull --verify-signatures ..  2>pullerror &&
+       test_i18ngrep "does not have a GPG signature" pullerror
+'
+
 test_done