Merge branch 'nd/upload-pack-shallow'

diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index ea00d71e77e05af212e2d69b3eced450b119fcf1..658353277ee1e2c1b666d22961a8141dbb1bdd17 100755 (executable)
--- a/t/t6130-pathspec-noglob.sh
+++ b/t/t6130-pathspec-noglob.sh
@@ -108,6 +108,13 @@ test_expect_success 'no-glob environment variable works' '
        test_cmp expect actual
 '
 
+test_expect_success 'blame takes global pathspec flags' '
+       git --literal-pathspecs blame -- foo &&
+       git --icase-pathspecs   blame -- foo &&
+       git --glob-pathspecs    blame -- foo &&
+       git --noglob-pathspecs  blame -- foo
+'
+
 test_expect_success 'setup xxx/bar' '
        mkdir xxx &&
        test_commit xxx xxx/bar