mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
eef3df5a93
Commit74ed43711f(grep: enable recurse-submodules to work on <tree> objects, 2016-12-16) taught 'tree_entry_interesting()' to be able to match across submodule boundaries in the presence of wildcards. This is done by performing literal matching up to the first wildcard and then punting to the submodule itself to perform more accurate pattern matching. Instead of introducing a new flag to request this behavior, commit74ed43711foverloaded the already existing 'recursive' flag in 'struct pathspec' to request this behavior. This leads to a bug where whenever any other caller has the 'recursive' flag set as well as a pathspec with wildcards that all submodules will be indicated as matches. One simple example of this is: git init repo cd repo git init submodule git -C submodule commit -m initial --allow-empty touch "[bracket]" git add "[bracket]" git commit -m bracket git add submodule git commit -m submodule git rev-list HEAD -- "[bracket]" Fix this by introducing the new flag 'recurse_submodules' in 'struct pathspec' and using this flag to determine if matches should be allowed to cross submodule boundaries. This fixes https://github.com/git-for-windows/git/issues/1371. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
115 lines
2.7 KiB
Bash
Executable file
115 lines
2.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='magic pathspec tests using git-log'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit initial &&
|
|
test_tick &&
|
|
git commit --allow-empty -m empty &&
|
|
mkdir sub
|
|
'
|
|
|
|
test_expect_success '"git log :/" should not be ambiguous' '
|
|
git log :/
|
|
'
|
|
|
|
test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
|
|
: >a &&
|
|
test_must_fail git log :/a 2>error &&
|
|
test_i18ngrep ambiguous error
|
|
'
|
|
|
|
test_expect_success '"git log :/a -- " should not be ambiguous' '
|
|
git log :/a --
|
|
'
|
|
|
|
test_expect_success '"git log -- :/a" should not be ambiguous' '
|
|
git log -- :/a
|
|
'
|
|
|
|
# This differs from the ":/a" check above in that :/in looks like a pathspec,
|
|
# but doesn't match an actual file.
|
|
test_expect_success '"git log :/in" should not be ambiguous' '
|
|
git log :/in
|
|
'
|
|
|
|
test_expect_success '"git log :" should be ambiguous' '
|
|
test_must_fail git log : 2>error &&
|
|
test_i18ngrep ambiguous error
|
|
'
|
|
|
|
test_expect_success 'git log -- :' '
|
|
git log -- :
|
|
'
|
|
|
|
test_expect_success 'git log HEAD -- :/' '
|
|
cat >expected <<-EOF &&
|
|
24b24cf initial
|
|
EOF
|
|
(cd sub && git log --oneline HEAD -- :/ >../actual) &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success '"git log :^sub" is not ambiguous' '
|
|
git log :^sub
|
|
'
|
|
|
|
test_expect_success '"git log :^does-not-exist" does not match anything' '
|
|
test_must_fail git log :^does-not-exist
|
|
'
|
|
|
|
test_expect_success '"git log :!" behaves the same as :^' '
|
|
git log :!sub &&
|
|
test_must_fail git log :!does-not-exist
|
|
'
|
|
|
|
test_expect_success '"git log :(exclude)sub" is not ambiguous' '
|
|
git log ":(exclude)sub"
|
|
'
|
|
|
|
test_expect_success '"git log :(exclude)sub --" must resolve as an object' '
|
|
test_must_fail git log ":(exclude)sub" --
|
|
'
|
|
|
|
test_expect_success '"git log :(unknown-magic) complains of bogus magic' '
|
|
test_must_fail git log ":(unknown-magic)" 2>error &&
|
|
test_i18ngrep pathspec.magic error
|
|
'
|
|
|
|
test_expect_success 'command line pathspec parsing for "git log"' '
|
|
git reset --hard &&
|
|
>a &&
|
|
git add a &&
|
|
git commit -m "add an empty a" --allow-empty &&
|
|
echo 1 >a &&
|
|
git commit -a -m "update a to 1" &&
|
|
git checkout HEAD^ &&
|
|
echo 2 >a &&
|
|
git commit -a -m "update a to 2" &&
|
|
test_must_fail git merge master &&
|
|
git add a &&
|
|
git log --merge -- a
|
|
'
|
|
|
|
test_expect_success 'tree_entry_interesting does not match past submodule boundaries' '
|
|
test_when_finished "rm -rf repo submodule" &&
|
|
git init submodule &&
|
|
test_commit -C submodule initial &&
|
|
git init repo &&
|
|
>"repo/[bracket]" &&
|
|
git -C repo add "[bracket]" &&
|
|
test_tick &&
|
|
git -C repo commit -m bracket &&
|
|
git -C repo rev-list HEAD -- "[bracket]" >expect &&
|
|
|
|
git -C repo submodule add ../submodule &&
|
|
test_tick &&
|
|
git -C repo commit -m submodule &&
|
|
|
|
git -C repo rev-list HEAD -- "[bracket]" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|