Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / t / t5521-pull-options.sh

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 159afa7ac81396e1d9915335f030cd0fcc8b7b3f..db1a381cd91c3470b7007b747e3b3a82f4da162f 100755 (executable)
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -85,6 +85,13 @@ test_expect_success 'git pull --cleanup errors early on invalid argument' '
        test -s err)
 '
 
+test_expect_success 'git pull --no-write-fetch-head fails' '
+       mkdir clonedwfh &&
+       (cd clonedwfh && git init &&
+       test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err &&
+       test_must_be_empty out &&
+       test_i18ngrep "no-write-fetch-head" err)
+'
 
 test_expect_success 'git pull --force' '
        mkdir clonedoldstyle &&