mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
4a2d5ae262
Normally parse_pathspec() is used on command line arguments where it can do fancy thing like parsing magic on each argument or adding magic for all pathspecs based on --*-pathspecs options. There's another use of parse_pathspec(), where pathspec is needed, but the input is known to be pure paths. In this case we usually don't want --*-pathspecs to interfere. And we definitely do not want to parse magic in these paths, regardless of --literal-pathspecs. Add new flag PATHSPEC_LITERAL_PATH for this purpose. When it's set, --*-pathspecs are ignored, no magic is parsed. And if the caller allows PATHSPEC_LITERAL (i.e. the next calls can take literal magic), then PATHSPEC_LITERAL will be set. This fixes cases where git chokes when GIT_*_PATHSPECS are set because parse_pathspec() indicates it won't take any magic. But GIT_*_PATHSPECS add them anyway. These are export GIT_LITERAL_PATHSPECS=1 git blame -- something git log --follow something git log --merge "git ls-files --with-tree=path" (aka parse_pathspec() in overlay_tree_on_cache()) is safe because the input is empty, and producing one pathspec due to PATHSPEC_PREFER_CWD does not take any magic into account. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
162 lines
4 KiB
Bash
Executable file
162 lines
4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test globbing (and noglob) of pathspec limiting'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'create commits with glob characters' '
|
|
test_commit unrelated bar &&
|
|
test_commit vanilla foo &&
|
|
# insert file "f*" in the commit, but in a way that avoids
|
|
# the name "f*" in the worktree, because it is not allowed
|
|
# on Windows (the tests below do not depend on the presence
|
|
# of the file in the worktree)
|
|
git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
|
|
test_tick &&
|
|
git commit -m star &&
|
|
test_commit bracket "f[o][o]"
|
|
'
|
|
|
|
test_expect_success 'vanilla pathspec matches literally' '
|
|
echo vanilla >expect &&
|
|
git log --format=%s -- foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'star pathspec globs' '
|
|
cat >expect <<-\EOF &&
|
|
bracket
|
|
star
|
|
vanilla
|
|
EOF
|
|
git log --format=%s -- "f*" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'star pathspec globs' '
|
|
cat >expect <<-\EOF &&
|
|
bracket
|
|
star
|
|
vanilla
|
|
EOF
|
|
git log --format=%s -- ":(glob)f*" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'bracket pathspec globs and matches literal brackets' '
|
|
cat >expect <<-\EOF &&
|
|
bracket
|
|
vanilla
|
|
EOF
|
|
git log --format=%s -- "f[o][o]" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'bracket pathspec globs and matches literal brackets' '
|
|
cat >expect <<-\EOF &&
|
|
bracket
|
|
vanilla
|
|
EOF
|
|
git log --format=%s -- ":(glob)f[o][o]" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option matches literally (vanilla)' '
|
|
echo vanilla >expect &&
|
|
git --literal-pathspecs log --format=%s -- foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option matches literally (vanilla)' '
|
|
echo vanilla >expect &&
|
|
git log --format=%s -- ":(literal)foo" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option matches literally (star)' '
|
|
echo star >expect &&
|
|
git --literal-pathspecs log --format=%s -- "f*" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option matches literally (star)' '
|
|
echo star >expect &&
|
|
git log --format=%s -- ":(literal)f*" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option matches literally (bracket)' '
|
|
echo bracket >expect &&
|
|
git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option matches literally (bracket)' '
|
|
echo bracket >expect &&
|
|
git log --format=%s -- ":(literal)f[o][o]" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob option disables :(literal)' '
|
|
: >expect &&
|
|
git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no-glob environment variable works' '
|
|
echo star >expect &&
|
|
GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
|
|
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
|
|
'
|
|
|
|
test_expect_success '**/ works with :(glob)' '
|
|
cat >expect <<-\EOF &&
|
|
xxx
|
|
unrelated
|
|
EOF
|
|
git log --format=%s -- ":(glob)**/bar" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '**/ does not work with --noglob-pathspecs' '
|
|
: >expect &&
|
|
git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '**/ works with :(glob) and --noglob-pathspecs' '
|
|
cat >expect <<-\EOF &&
|
|
xxx
|
|
unrelated
|
|
EOF
|
|
git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '**/ works with --glob-pathspecs' '
|
|
cat >expect <<-\EOF &&
|
|
xxx
|
|
unrelated
|
|
EOF
|
|
git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '**/ does not work with :(literal) and --glob-pathspecs' '
|
|
: >expect &&
|
|
git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|