2011-05-26 22:41:18 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='test subject preservation with format-patch | am'
|
tests: mark tests as passing with SANITIZE=leak
When the "ab/various-leak-fixes" topic was merged in [1] only t6021
would fail if the tests were run in the
"GIT_TEST_PASSING_SANITIZE_LEAK=check" mode, i.e. to check whether we
marked all leak-free tests with "TEST_PASSES_SANITIZE_LEAK=true".
Since then we've had various tests starting to pass under
SANITIZE=leak. Let's mark those as passing, this is when they started
to pass, narrowed down with "git bisect":
- t5317-pack-objects-filter-objects.sh: In
faebba436e6 (list-objects-filter: plug pattern_list leak, 2022-12-01).
- t3210-pack-refs.sh, t5613-info-alternate.sh,
t7403-submodule-sync.sh: In 189e97bc4ba (diff: remove parseopts member
from struct diff_options, 2022-12-01).
- t1408-packed-refs.sh: In ab91f6b7c42 (Merge branch
'rs/diff-parseopts', 2022-12-19).
- t0023-crlf-am.sh, t4152-am-subjects.sh, t4254-am-corrupt.sh,
t4256-am-format-flowed.sh, t4257-am-interactive.sh,
t5403-post-checkout-hook.sh: In a658e881c13 (am: don't pass strvec to
apply_parse_options(), 2022-12-13)
- t1301-shared-repo.sh, t1302-repo-version.sh: In b07a819c05f (reflog:
clear leftovers in reflog_expiry_cleanup(), 2022-12-13).
- t1304-default-acl.sh, t1410-reflog.sh,
t5330-no-lazy-fetch-with-commit-graph.sh, t5502-quickfetch.sh,
t5604-clone-reference.sh, t6014-rev-list-all.sh,
t7701-repack-unpack-unreachable.sh: In b0c61be3209 (Merge branch
'rs/reflog-expiry-cleanup', 2022-12-26)
- t3800-mktag.sh, t5302-pack-index.sh, t5306-pack-nobase.sh,
t5573-pull-verify-signatures.sh, t7612-merge-verify-signatures.sh: In
69bbbe484ba (hash-object: use fsck for object checks, 2023-01-18).
- t1451-fsck-buffer.sh: In 8e4309038f0 (fsck: do not assume
NUL-termination of buffers, 2023-01-19).
- t6501-freshen-objects.sh: In abf2bb895b4 (Merge branch
'jk/hash-object-fsck', 2023-01-30)
1. 9ea1378d046 (Merge branch 'ab/various-leak-fixes', 2022-12-14)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-07 00:07:36 +01:00
|
|
|
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2011-05-26 22:41:18 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
make_patches() {
|
|
|
|
type=$1
|
|
|
|
subject=$2
|
|
|
|
test_expect_success "create patches with $type subject" '
|
|
|
|
git reset --hard baseline &&
|
|
|
|
echo $type >file &&
|
|
|
|
git commit -a -m "$subject" &&
|
|
|
|
git format-patch -1 --stdout >$type.patch &&
|
|
|
|
git format-patch -1 --stdout -k >$type-k.patch
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
check_subject() {
|
|
|
|
git reset --hard baseline &&
|
|
|
|
git am $2 $1.patch &&
|
|
|
|
git log -1 --pretty=format:%B >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'setup baseline commit' '
|
|
|
|
test_commit baseline file
|
|
|
|
'
|
|
|
|
|
|
|
|
SHORT_SUBJECT='short subject'
|
|
|
|
make_patches short "$SHORT_SUBJECT"
|
|
|
|
|
|
|
|
LONG_SUBJECT1='this is a long subject that is virtually guaranteed'
|
|
|
|
LONG_SUBJECT2='to require wrapping via format-patch if it is all'
|
|
|
|
LONG_SUBJECT3='going to appear on a single line'
|
|
|
|
LONG_SUBJECT="$LONG_SUBJECT1 $LONG_SUBJECT2 $LONG_SUBJECT3"
|
|
|
|
make_patches long "$LONG_SUBJECT"
|
|
|
|
|
|
|
|
MULTILINE_SUBJECT="$LONG_SUBJECT1
|
|
|
|
$LONG_SUBJECT2
|
|
|
|
$LONG_SUBJECT3"
|
|
|
|
make_patches multiline "$MULTILINE_SUBJECT"
|
|
|
|
|
|
|
|
echo "$SHORT_SUBJECT" >expect
|
|
|
|
test_expect_success 'short subject preserved (format-patch | am)' '
|
|
|
|
check_subject short
|
|
|
|
'
|
|
|
|
test_expect_success 'short subject preserved (format-patch -k | am)' '
|
|
|
|
check_subject short-k
|
|
|
|
'
|
|
|
|
test_expect_success 'short subject preserved (format-patch -k | am -k)' '
|
|
|
|
check_subject short-k -k
|
|
|
|
'
|
|
|
|
|
|
|
|
echo "$LONG_SUBJECT" >expect
|
|
|
|
test_expect_success 'long subject preserved (format-patch | am)' '
|
|
|
|
check_subject long
|
|
|
|
'
|
|
|
|
test_expect_success 'long subject preserved (format-patch -k | am)' '
|
|
|
|
check_subject long-k
|
|
|
|
'
|
2011-05-26 22:53:38 +02:00
|
|
|
test_expect_success 'long subject preserved (format-patch -k | am -k)' '
|
2011-05-26 22:41:18 +02:00
|
|
|
check_subject long-k -k
|
|
|
|
'
|
|
|
|
|
|
|
|
echo "$LONG_SUBJECT" >expect
|
|
|
|
test_expect_success 'multiline subject unwrapped (format-patch | am)' '
|
|
|
|
check_subject multiline
|
|
|
|
'
|
|
|
|
test_expect_success 'multiline subject unwrapped (format-patch -k | am)' '
|
|
|
|
check_subject multiline-k
|
|
|
|
'
|
|
|
|
echo "$MULTILINE_SUBJECT" >expect
|
2011-05-27 00:28:17 +02:00
|
|
|
test_expect_success 'multiline subject preserved (format-patch -k | am -k)' '
|
2011-05-26 22:41:18 +02:00
|
|
|
check_subject multiline-k -k
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|