6d0a40166e
Refactor the existing tests added ine0e7cb8080(log -G: ignore binary files, 2018-12-14) to use the --append option I added in3373518cc8(test-lib functions: add an --append option to test_commit, 2021-01-12) and the --printf option added as part of an in-flight topic of mine this commit depends on. While I'm at it change some of the setup of the test to use a more sensible pattern, e.g. setting up a temporary repo instead of creating an orphan branch. Since the -G and -S options will behave the same way with truncated and removed content also change the "git rm" to emptying data.bin, that's just catering to how test_commit works. The resulting test is shorter. See alsof5d79bf7dd(tests: refactor a few tests to use "test_commit --append", 2021-01-12) for prior similar refactoring. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
143 lines
3.5 KiB
Bash
Executable File
143 lines
3.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='log --grep/--author/--regexp-ignore-case/-S/-G'
|
|
. ./test-lib.sh
|
|
|
|
test_log () {
|
|
expect=$1
|
|
kind=$2
|
|
needle=$3
|
|
shift 3
|
|
rest=$@
|
|
|
|
case $kind in
|
|
--*)
|
|
opt=$kind=$needle
|
|
;;
|
|
*)
|
|
opt=$kind$needle
|
|
;;
|
|
esac
|
|
case $expect in
|
|
expect_nomatch)
|
|
match=nomatch
|
|
;;
|
|
*)
|
|
match=match
|
|
;;
|
|
esac
|
|
|
|
test_expect_success "log $kind${rest:+ $rest} ($match)" "
|
|
git log $rest $opt --format=%H >actual &&
|
|
test_cmp $expect actual
|
|
"
|
|
}
|
|
|
|
# test -i and --regexp-ignore-case and expect both to behave the same way
|
|
test_log_icase () {
|
|
test_log $@ --regexp-ignore-case
|
|
test_log $@ -i
|
|
}
|
|
|
|
test_expect_success setup '
|
|
>expect_nomatch &&
|
|
|
|
>file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
git rev-parse --verify HEAD >expect_initial &&
|
|
|
|
echo Picked >file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit --author="Another Person <another@example.com>" -m second &&
|
|
git rev-parse --verify HEAD >expect_second
|
|
'
|
|
|
|
test_log expect_initial --grep initial
|
|
test_log expect_nomatch --grep InItial
|
|
test_log_icase expect_initial --grep InItial
|
|
test_log_icase expect_nomatch --grep initail
|
|
|
|
test_log expect_second --author Person
|
|
test_log expect_nomatch --author person
|
|
test_log_icase expect_second --author person
|
|
test_log_icase expect_nomatch --author spreon
|
|
|
|
test_log expect_nomatch -G picked
|
|
test_log expect_second -G Picked
|
|
test_log_icase expect_nomatch -G pickle
|
|
test_log_icase expect_second -G picked
|
|
|
|
test_expect_success 'log -G --textconv (missing textconv tool)' '
|
|
echo "* diff=test" >.gitattributes &&
|
|
test_must_fail git -c diff.test.textconv=missing log -Gfoo &&
|
|
rm .gitattributes
|
|
'
|
|
|
|
test_expect_success 'log -G --no-textconv (missing textconv tool)' '
|
|
echo "* diff=test" >.gitattributes &&
|
|
git -c diff.test.textconv=missing log -Gfoo --no-textconv >actual &&
|
|
test_cmp expect_nomatch actual &&
|
|
rm .gitattributes
|
|
'
|
|
|
|
test_log expect_nomatch -S picked
|
|
test_log expect_second -S Picked
|
|
test_log_icase expect_second -S picked
|
|
test_log_icase expect_nomatch -S pickle
|
|
|
|
test_log expect_nomatch -S p.cked --pickaxe-regex
|
|
test_log expect_second -S P.cked --pickaxe-regex
|
|
test_log_icase expect_second -S p.cked --pickaxe-regex
|
|
test_log_icase expect_nomatch -S p.ckle --pickaxe-regex
|
|
|
|
test_expect_success 'log -S --textconv (missing textconv tool)' '
|
|
echo "* diff=test" >.gitattributes &&
|
|
test_must_fail git -c diff.test.textconv=missing log -Sfoo &&
|
|
rm .gitattributes
|
|
'
|
|
|
|
test_expect_success 'log -S --no-textconv (missing textconv tool)' '
|
|
echo "* diff=test" >.gitattributes &&
|
|
git -c diff.test.textconv=missing log -Sfoo --no-textconv >actual &&
|
|
test_cmp expect_nomatch actual &&
|
|
rm .gitattributes
|
|
'
|
|
|
|
test_expect_success 'setup log -[GS] binary & --text' '
|
|
test_create_repo GS-bin-txt &&
|
|
test_commit -C GS-bin-txt --printf A data.bin "a\na\0a\n" &&
|
|
test_commit -C GS-bin-txt --append --printf B data.bin "a\na\0a\n" &&
|
|
test_commit -C GS-bin-txt C data.bin "" &&
|
|
git -C GS-bin-txt log >full-log
|
|
'
|
|
|
|
test_expect_success 'log -G ignores binary files' '
|
|
git -C GS-bin-txt log -Ga >log &&
|
|
test_must_be_empty log
|
|
'
|
|
|
|
test_expect_success 'log -G looks into binary files with -a' '
|
|
git -C GS-bin-txt log -a -Ga >log &&
|
|
test_cmp log full-log
|
|
'
|
|
|
|
test_expect_success 'log -G looks into binary files with textconv filter' '
|
|
test_when_finished "rm GS-bin-txt/.gitattributes" &&
|
|
(
|
|
cd GS-bin-txt &&
|
|
echo "* diff=bin" >.gitattributes &&
|
|
git -c diff.bin.textconv=cat log -Ga >../log
|
|
) &&
|
|
test_cmp log full-log
|
|
'
|
|
|
|
test_expect_success 'log -S looks into binary files' '
|
|
git -C GS-bin-txt log -Sa >log &&
|
|
test_cmp log full-log
|
|
'
|
|
|
|
test_done
|