mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
04deccda11
If you run "git log --grep=foo", we will run your regex on
the literal bytes of the commit message. This can provide
confusing results if the commit message is not in the same
encoding as your grep expression (or worse, you have commits
in multiple encodings, in which case your regex would need
to be written to match either encoding). On top of this, we
might also be grepping in the commit's notes, which are
already re-encoded, potentially leading to grepping in a
buffer with mixed encodings concatenated. This is insanity,
but most people never noticed, because their terminal and
their commit encodings all match.
Instead, let's massage the to-be-grepped commit into a
standardized encoding. There is not much point in adding a
flag for "this is the encoding I expect my grep pattern to
match"; the only sane choice is for it to use the log output
encoding. That is presumably what the user's terminal is
using, and it means that the patterns found by the grep will
match the output produced by git.
As a bonus, this fixes a potential segfault in commit_match
when commit->buffer is NULL, as we now build on logmsg_reencode,
which handles reading the commit buffer from disk if
necessary. The segfault can be triggered with:
git commit -m 'text1' --allow-empty
git commit -m 'text2' --allow-empty
git log --graph --no-walk --grep 'text2'
which arguably does not make any sense (--graph inherently
wants a connected history, and by --no-walk the command line
is telling us to show discrete points in history without
connectivity), and we probably should forbid the
combination, but that is a separate issue.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.2 KiB
Bash
Executable file
58 lines
1.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test log with i18n features'
|
|
. ./test-lib.sh
|
|
|
|
# two forms of é
|
|
utf8_e=$(printf '\303\251')
|
|
latin1_e=$(printf '\351')
|
|
|
|
test_expect_success 'create commits in different encodings' '
|
|
test_tick &&
|
|
cat >msg <<-EOF &&
|
|
utf8
|
|
|
|
t${utf8_e}st
|
|
EOF
|
|
git add msg &&
|
|
git -c i18n.commitencoding=utf8 commit -F msg &&
|
|
cat >msg <<-EOF &&
|
|
latin1
|
|
|
|
t${latin1_e}st
|
|
EOF
|
|
git add msg &&
|
|
git -c i18n.commitencoding=ISO-8859-1 commit -F msg
|
|
'
|
|
|
|
test_expect_success 'log --grep searches in log output encoding (utf8)' '
|
|
cat >expect <<-\EOF &&
|
|
latin1
|
|
utf8
|
|
EOF
|
|
git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep searches in log output encoding (latin1)' '
|
|
cat >expect <<-\EOF &&
|
|
latin1
|
|
utf8
|
|
EOF
|
|
git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep does not find non-reencoded values (utf8)' '
|
|
>expect &&
|
|
git log --encoding=utf8 --format=%s --grep=$latin1_e >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep does not find non-reencoded values (latin1)' '
|
|
>expect &&
|
|
git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|