summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-18 22:31:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-18 22:31:29 (GMT)
commitc6f1b920ac8b41b9175910d5866924a12a0ce6b9 (patch)
treeddc33851da0035b36eb67c1dbe6b83b28342420c /t
parent33da0c9c3c2ec2706c80f70226739f14a66baa21 (diff)
parent4a2d5ae262a6d372d0951da9cee3c7ad2a8dbca6 (diff)
downloadgit-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.zip
git-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.tar.gz
git-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.tar.bz2
Merge branch 'nd/literal-pathspecs'
Fixes a regression on 'master' since v1.8.4. * nd/literal-pathspecs: pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
Diffstat (limited to 't')
-rwxr-xr-xt/t6130-pathspec-noglob.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index ea00d71..6583532 100755
--- 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