2012-09-27 21:12:52 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2012 Mozilla Foundation
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='diff.context configuration'
|
|
|
|
|
revisions API: have release_revisions() release "mailmap"
Extend the the release_revisions() function so that it frees the
"mailmap" in the "struct rev_info".
The log family of functions now calls the clear_mailmap() function
added in fa8afd18e5a (revisions API: provide and use a
release_revisions(), 2021-09-19), allowing us to whitelist some tests
with "TEST_PASSES_SANITIZE_LEAK=true".
Unfortunately having a pointer to a mailmap in "struct rev_info"
instead of an embedded member that we "own" get a bit messy, as can be
seen in the change to builtin/commit.c.
When we free() this data we won't be able to tell apart a pointer to a
"mailmap" on the heap from one on the stack. As seen in
ea57bc0d41b (log: add --use-mailmap option, 2013-01-05) the "log"
family allocates it on the heap, but in the find_author_by_nickname()
code added in ea16794e430 (commit: search author pattern against
mailmap, 2013-08-23) we allocated it on the stack instead.
Ideally we'd simply change that member to a "struct string_list
mailmap" and never free() the "mailmap" itself, but that would be a
much larger change to the revisions API.
We have code that needs to hand an existing "mailmap" to a "struct
rev_info", while we could change all of that, let's not go there
now.
The complexity isn't in the ownership of the "mailmap" per-se, but
that various things assume a "rev_info.mailmap == NULL" means "doesn't
want mailmap", if we changed that to an init'd "struct string_list
we'd need to carefully refactor things to change those assumptions.
Let's instead always free() it, and simply declare that if you add
such a "mailmap" it must be allocated on the heap. Any modern libc
will correctly panic if we free() a stack variable, so this should be
safe going forward.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13 22:01:46 +02:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2012-09-27 21:12:52 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
2012-10-02 20:50:16 +02:00
|
|
|
cat >template <<-\EOF &&
|
2012-09-27 21:12:52 +02:00
|
|
|
firstline
|
|
|
|
b
|
|
|
|
c
|
|
|
|
d
|
|
|
|
e
|
|
|
|
f
|
|
|
|
preline
|
2012-10-02 20:50:16 +02:00
|
|
|
TARGET
|
2012-09-27 21:12:52 +02:00
|
|
|
postline
|
|
|
|
i
|
|
|
|
j
|
|
|
|
k
|
|
|
|
l
|
|
|
|
m
|
|
|
|
n
|
|
|
|
EOF
|
2012-10-02 20:50:16 +02:00
|
|
|
sed "/TARGET/d" >x <template &&
|
2012-09-27 21:12:52 +02:00
|
|
|
git update-index --add x &&
|
|
|
|
git commit -m initial &&
|
|
|
|
|
2012-10-02 20:50:16 +02:00
|
|
|
sed "s/TARGET/ADDED/" >x <template &&
|
2012-09-27 21:12:52 +02:00
|
|
|
git update-index --add x &&
|
|
|
|
git commit -m next &&
|
|
|
|
|
2012-10-02 20:50:16 +02:00
|
|
|
sed "s/TARGET/MODIFIED/" >x <template
|
2012-09-27 21:12:52 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'the default number of context lines is 3' '
|
|
|
|
git diff >output &&
|
|
|
|
! grep "^ d" output &&
|
|
|
|
grep "^ e" output &&
|
|
|
|
grep "^ j" output &&
|
|
|
|
! grep "^ k" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'diff.context honored by "log"' '
|
|
|
|
git log -1 -p >output &&
|
|
|
|
! grep firstline output &&
|
|
|
|
git config diff.context 8 &&
|
|
|
|
git log -1 -p >output &&
|
|
|
|
grep "^ firstline" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'The -U option overrides diff.context' '
|
|
|
|
git config diff.context 8 &&
|
|
|
|
git log -U4 -1 >output &&
|
|
|
|
! grep "^ firstline" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'diff.context honored by "diff"' '
|
|
|
|
git config diff.context 8 &&
|
|
|
|
git diff >output &&
|
|
|
|
grep "^ firstline" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'plumbing not affected' '
|
|
|
|
git config diff.context 8 &&
|
|
|
|
git diff-files -p >output &&
|
|
|
|
! grep "^ firstline" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'non-integer config parsing' '
|
|
|
|
git config diff.context no &&
|
|
|
|
test_must_fail git diff 2>output &&
|
2013-09-08 10:38:22 +02:00
|
|
|
test_i18ngrep "bad numeric config value" output
|
2012-09-27 21:12:52 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'negative integer config parsing' '
|
|
|
|
git config diff.context -1 &&
|
|
|
|
test_must_fail git diff 2>output &&
|
2014-08-07 13:59:17 +02:00
|
|
|
test_i18ngrep "bad config variable" output
|
2012-09-27 21:12:52 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '-U0 is valid, so is diff.context=0' '
|
|
|
|
git config diff.context 0 &&
|
|
|
|
git diff >output &&
|
|
|
|
grep "^-ADDED" output &&
|
|
|
|
grep "^+MODIFIED" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|