mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
5fafe8c95f
When t5583-push-branches.sh was originally introduced via425b4d7f47(push: introduce '--branches' option, 2023-05-06), it was not leak-free. In fact, the test did not even run correctly until022fbb655d(t5583: fix shebang line, 2023-05-12), but after applying that patch, we see a failure at t5583.8: ==2529087==ERROR: LeakSanitizer: detected memory leaks Direct leak of 384 byte(s) in 1 object(s) allocated from: #0 0x7fb536330986 in __interceptor_realloc ../../../../src/libsanitizer/lsan/lsan_interceptors.cpp:98 #1 0x55e07606cbf9 in xrealloc wrapper.c:140 #2 0x55e075fb6cb3 in prio_queue_put prio-queue.c:42 #3 0x55e075ec81cb in get_reachable_subset commit-reach.c:917 #4 0x55e075fe9cce in add_missing_tags remote.c:1518 #5 0x55e075fea1e4 in match_push_refs remote.c:1665 #6 0x55e076050a8e in transport_push transport.c:1378 #7 0x55e075e2eb74 in push_with_options builtin/push.c:401 #8 0x55e075e2edb0 in do_push builtin/push.c:458 #9 0x55e075e2ff7a in cmd_push builtin/push.c:702 #10 0x55e075d8aaf0 in run_builtin git.c:452 #11 0x55e075d8af08 in handle_builtin git.c:706 #12 0x55e075d8b12c in run_argv git.c:770 #13 0x55e075d8b6a0 in cmd_main git.c:905 #14 0x55e075e81f07 in main common-main.c:60 #15 0x7fb5360ab6c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 #16 0x7fb5360ab784 in __libc_start_main_impl ../csu/libc-start.c:360 #17 0x55e075d88f40 in _start (git+0x1ff40) (BuildId: 38ad998b85a535e786129979443630d025ec2453) SUMMARY: LeakSanitizer: 384 byte(s) leaked in 1 allocation(s). This leak was addressed independently via68b51172e3(commit-reach: fix memory leak in get_reachable_subset(), 2023-06-03), which makes t5583 leak-free. But t5583 was not in the tree when68b51172e3was written, and the two only met after the latter was merged back in via693bde461c(Merge branch 'mh/commit-reach-get-reachable-plug-leak', 2023-06-20). At that point, t5583 was leak-free. Let's mark it as such accordingly. Signed-off-by: Taylor Blau <me@ttaylorr.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
116 lines
3.4 KiB
Bash
Executable file
116 lines
3.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='check the consisitency of behavior of --all and --branches'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
delete_refs() {
|
|
dir=$1
|
|
shift
|
|
rm -rf deletes
|
|
for arg in $*
|
|
do
|
|
echo "delete ${arg}" >>deletes
|
|
done
|
|
git -C $dir update-ref --stdin < deletes
|
|
}
|
|
|
|
test_expect_success 'setup bare remote' '
|
|
git init --bare remote-1 &&
|
|
git -C remote-1 config gc.auto 0 &&
|
|
test_commit one &&
|
|
git push remote-1 HEAD
|
|
'
|
|
|
|
test_expect_success 'setup different types of references' '
|
|
cat >refs <<-EOF &&
|
|
update refs/heads/branch-1 HEAD
|
|
update refs/heads/branch-2 HEAD
|
|
EOF
|
|
|
|
git tag -a -m "annotated" annotated-1 HEAD &&
|
|
git tag -a -m "annotated" annotated-2 HEAD &&
|
|
git update-ref --stdin < refs
|
|
'
|
|
|
|
test_expect_success '--all and --branches have the same behavior' '
|
|
test_when_finished "delete_refs remote-1 \
|
|
refs/heads/branch-1 \
|
|
refs/heads/branch-2" &&
|
|
git push remote-1 --all &&
|
|
commit=$(git rev-parse HEAD) &&
|
|
cat >expect <<-EOF &&
|
|
$commit refs/heads/branch-1
|
|
$commit refs/heads/branch-2
|
|
$commit refs/heads/main
|
|
EOF
|
|
|
|
git -C remote-1 show-ref --heads >actual.all &&
|
|
delete_refs remote-1 refs/heads/branch-1 refs/heads/branch-2 &&
|
|
git push remote-1 --branches &&
|
|
git -C remote-1 show-ref --heads >actual.branches &&
|
|
test_cmp actual.all actual.branches &&
|
|
test_cmp expect actual.all
|
|
'
|
|
|
|
test_expect_success '--all or --branches can not be combined with refspecs' '
|
|
test_must_fail git push remote-1 --all main >actual.all 2>&1 &&
|
|
test_must_fail git push remote-1 --branches main >actual.branches 2>&1 &&
|
|
test_cmp actual.all actual.branches &&
|
|
grep "be combined with refspecs" actual.all
|
|
'
|
|
|
|
test_expect_success '--all or --branches can not be combined with --mirror' '
|
|
test_must_fail git push remote-1 --all --mirror >actual.all 2>&1 &&
|
|
test_must_fail git push remote-1 --branches --mirror >actual.branches 2>&1 &&
|
|
test_cmp actual.all actual.branches &&
|
|
grep "cannot be used together" actual.all
|
|
'
|
|
|
|
test_expect_success '--all or --branches can not be combined with --tags' '
|
|
test_must_fail git push remote-1 --all --tags >actual.all 2>&1 &&
|
|
test_must_fail git push remote-1 --branches --tags >actual.branches 2>&1 &&
|
|
test_cmp actual.all actual.branches &&
|
|
grep "cannot be used together" actual.all
|
|
'
|
|
|
|
|
|
test_expect_success '--all or --branches can not be combined with --delete' '
|
|
test_must_fail git push remote-1 --all --delete >actual.all 2>&1 &&
|
|
test_must_fail git push remote-1 --branches --delete >actual.branches 2>&1 &&
|
|
test_cmp actual.all actual.branches &&
|
|
grep "cannot be used together" actual.all
|
|
'
|
|
|
|
test_expect_success '--all or --branches combines with --follow-tags have same behavior' '
|
|
test_when_finished "delete_refs remote-1 \
|
|
refs/heads/branch-1 \
|
|
refs/heads/branch-2 \
|
|
refs/tags/annotated-1 \
|
|
refs/tags/annotated-2" &&
|
|
git push remote-1 --all --follow-tags &&
|
|
git -C remote-1 show-ref > actual.all &&
|
|
cat >expect <<-EOF &&
|
|
$commit refs/heads/branch-1
|
|
$commit refs/heads/branch-2
|
|
$commit refs/heads/main
|
|
$(git rev-parse annotated-1) refs/tags/annotated-1
|
|
$(git rev-parse annotated-2) refs/tags/annotated-2
|
|
EOF
|
|
|
|
delete_refs remote-1 \
|
|
refs/heads/branch-1 \
|
|
refs/heads/branch-2 \
|
|
refs/tags/annotated-1 \
|
|
refs/tags/annotated-2 &&
|
|
git push remote-1 --branches --follow-tags &&
|
|
git -C remote-1 show-ref >actual.branches &&
|
|
test_cmp actual.all actual.branches &&
|
|
test_cmp expect actual.all
|
|
'
|
|
|
|
test_done
|