mirror of
https://github.com/git/git.git
synced 2024-12-12 03:14:11 +08:00
b2e5d75d17
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: Infaebba436e(list-objects-filter: plug pattern_list leak, 2022-12-01). - t3210-pack-refs.sh, t5613-info-alternate.sh, t7403-submodule-sync.sh: In189e97bc4b(diff: remove parseopts member from struct diff_options, 2022-12-01). - t1408-packed-refs.sh: Inab91f6b7c4(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: Ina658e881c1(am: don't pass strvec to apply_parse_options(), 2022-12-13) - t1301-shared-repo.sh, t1302-repo-version.sh: Inb07a819c05(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: Inb0c61be320(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: In69bbbe484b(hash-object: use fsck for object checks, 2023-01-18). - t1451-fsck-buffer.sh: In8e4309038f(fsck: do not assume NUL-termination of buffers, 2023-01-19). - t6501-freshen-objects.sh: Inabf2bb895b(Merge branch 'jk/hash-object-fsck', 2023-01-30) 1.9ea1378d04(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>
55 lines
1.3 KiB
Bash
Executable File
55 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='am --interactive tests'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'set up patches to apply' '
|
|
test_commit unrelated &&
|
|
test_commit no-conflict &&
|
|
test_commit conflict-patch file patch &&
|
|
git format-patch --stdout -2 >mbox &&
|
|
|
|
git reset --hard unrelated &&
|
|
test_commit conflict-main file main base
|
|
'
|
|
|
|
# Sanity check our setup.
|
|
test_expect_success 'applying all patches generates conflict' '
|
|
test_must_fail git am mbox &&
|
|
echo resolved >file &&
|
|
git add -u &&
|
|
git am --resolved
|
|
'
|
|
|
|
test_expect_success 'interactive am can apply a single patch' '
|
|
git reset --hard base &&
|
|
# apply the first, but not the second
|
|
test_write_lines y n | git am -i mbox &&
|
|
|
|
echo no-conflict >expect &&
|
|
git log -1 --format=%s >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'interactive am can resolve conflict' '
|
|
git reset --hard base &&
|
|
# apply both; the second one will conflict
|
|
test_write_lines y y | test_must_fail git am -i mbox &&
|
|
echo resolved >file &&
|
|
git add -u &&
|
|
# interactive "--resolved" will ask us if we want to apply the result
|
|
echo y | git am -i --resolved &&
|
|
|
|
echo conflict-patch >expect &&
|
|
git log -1 --format=%s >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
echo resolved >expect &&
|
|
git cat-file blob HEAD:file >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|