Fix a memory leak in code added in5d7eeee2ac(git-show: grok blobs, trees and tags, too, 2006-12-14). As we iterate over a "<revision>..." command-line and encounter ad OBJ_COMMIT we want to use our "struct rev_info", but with a "pending" array of one element: the one commit we're showing in the loop. To do this5d7eeee2acsaved away a pointer to rev.pending.objects and rev.pending.nr for its iteration. We'd then clobber those (and alloc) when we needed to show an OBJ_COMMIT. We'd therefore leak the "rev.pending" we started out with, and only free the new "rev.pending" in the "OBJ_COMMIT" case arm as prepare_revision_walk() would draw it down. Let's fix this memory leak. Now when we encounter an OBJ_COMMIT we save away the "rev.pending" before clearing it. We then add a single commit to it, which our indirect invocation of prepare_revision_walk() will remove. After that we restore the "rev.pending". Our "rev.pending" will then get free'd by the release_revisions() added inf6bfea0ad0(revisions API users: use release_revisions() in builtin/log.c, 2022-04-13) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			284 lines
		
	
	
		
			7.2 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			284 lines
		
	
	
		
			7.2 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='pre-commit and pre-merge-commit hooks'
 | 
						|
 | 
						|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 | 
						|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 | 
						|
 | 
						|
TEST_PASSES_SANITIZE_LEAK=true
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
test_expect_success 'root commit' '
 | 
						|
	echo "root" >file &&
 | 
						|
	git add file &&
 | 
						|
	git commit -m "zeroth" &&
 | 
						|
	git checkout -b side &&
 | 
						|
	echo "foo" >foo &&
 | 
						|
	git add foo &&
 | 
						|
	git commit -m "make it non-ff" &&
 | 
						|
	git branch side-orig side &&
 | 
						|
	git checkout main
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'setup conflicting branches' '
 | 
						|
	test_when_finished "git checkout main" &&
 | 
						|
	git checkout -b conflicting-a main &&
 | 
						|
	echo a >conflicting &&
 | 
						|
	git add conflicting &&
 | 
						|
	git commit -m conflicting-a &&
 | 
						|
	git checkout -b conflicting-b main &&
 | 
						|
	echo b >conflicting &&
 | 
						|
	git add conflicting &&
 | 
						|
	git commit -m conflicting-b
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'with no hook' '
 | 
						|
	test_when_finished "rm -f actual_hooks" &&
 | 
						|
	echo "foo" >file &&
 | 
						|
	git add file &&
 | 
						|
	git commit -m "first" &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'with no hook (merge)' '
 | 
						|
	test_when_finished "rm -f actual_hooks" &&
 | 
						|
	git branch -f side side-orig &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success '--no-verify with no hook' '
 | 
						|
	test_when_finished "rm -f actual_hooks" &&
 | 
						|
	echo "bar" >file &&
 | 
						|
	git add file &&
 | 
						|
	git commit --no-verify -m "bar" &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success '--no-verify with no hook (merge)' '
 | 
						|
	test_when_finished "rm -f actual_hooks" &&
 | 
						|
	git branch -f side side-orig &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge --no-verify -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
setup_success_hook () {
 | 
						|
	test_when_finished "rm -f actual_hooks expected_hooks" &&
 | 
						|
	echo "$1" >expected_hooks &&
 | 
						|
	test_hook "$1" <<-EOF
 | 
						|
	echo $1 >>actual_hooks
 | 
						|
	EOF
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success 'with succeeding hook' '
 | 
						|
	setup_success_hook "pre-commit" &&
 | 
						|
	echo "more" >>file &&
 | 
						|
	git add file &&
 | 
						|
	git commit -m "more" &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'with succeeding hook (merge)' '
 | 
						|
	setup_success_hook "pre-merge-commit" &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'automatic merge fails; both hooks are available' '
 | 
						|
	setup_success_hook "pre-commit" &&
 | 
						|
	setup_success_hook "pre-merge-commit" &&
 | 
						|
 | 
						|
	git checkout conflicting-a &&
 | 
						|
	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
 | 
						|
	test_path_is_missing actual_hooks &&
 | 
						|
 | 
						|
	echo "pre-commit" >expected_hooks &&
 | 
						|
	echo a+b >conflicting &&
 | 
						|
	git add conflicting &&
 | 
						|
	git commit -m "resolve conflict" &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success '--no-verify with succeeding hook' '
 | 
						|
	setup_success_hook "pre-commit" &&
 | 
						|
	echo "even more" >>file &&
 | 
						|
	git add file &&
 | 
						|
	git commit --no-verify -m "even more" &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success '--no-verify with succeeding hook (merge)' '
 | 
						|
	setup_success_hook "pre-merge-commit" &&
 | 
						|
	git branch -f side side-orig &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge --no-verify -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
setup_failing_hook () {
 | 
						|
	test_when_finished "rm -f actual_hooks" &&
 | 
						|
	test_hook "$1" <<-EOF
 | 
						|
	echo $1-failing-hook >>actual_hooks
 | 
						|
	exit 1
 | 
						|
	EOF
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success 'with failing hook' '
 | 
						|
	setup_failing_hook "pre-commit" &&
 | 
						|
	test_when_finished "rm -f expected_hooks" &&
 | 
						|
	echo "pre-commit-failing-hook" >expected_hooks &&
 | 
						|
 | 
						|
	echo "another" >>file &&
 | 
						|
	git add file &&
 | 
						|
	test_must_fail git commit -m "another" &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success '--no-verify with failing hook' '
 | 
						|
	setup_failing_hook "pre-commit" &&
 | 
						|
	echo "stuff" >>file &&
 | 
						|
	git add file &&
 | 
						|
	git commit --no-verify -m "stuff" &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'with failing hook (merge)' '
 | 
						|
	setup_failing_hook "pre-merge-commit" &&
 | 
						|
	echo "pre-merge-commit-failing-hook" >expected_hooks &&
 | 
						|
	git checkout side &&
 | 
						|
	test_must_fail git merge -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success '--no-verify with failing hook (merge)' '
 | 
						|
	setup_failing_hook "pre-merge-commit" &&
 | 
						|
 | 
						|
	git branch -f side side-orig &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge --no-verify -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
setup_non_exec_hook () {
 | 
						|
	test_when_finished "rm -f actual_hooks" &&
 | 
						|
	test_hook "$1" <<-\EOF &&
 | 
						|
	echo non-exec >>actual_hooks
 | 
						|
	exit 1
 | 
						|
	EOF
 | 
						|
	test_hook --disable "$1"
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
test_expect_success POSIXPERM 'with non-executable hook' '
 | 
						|
	setup_non_exec_hook "pre-commit" &&
 | 
						|
	echo "content" >>file &&
 | 
						|
	git add file &&
 | 
						|
	git commit -m "content" &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success POSIXPERM '--no-verify with non-executable hook' '
 | 
						|
	setup_non_exec_hook "pre-commit" &&
 | 
						|
	echo "more content" >>file &&
 | 
						|
	git add file &&
 | 
						|
	git commit --no-verify -m "more content" &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success POSIXPERM 'with non-executable hook (merge)' '
 | 
						|
	setup_non_exec_hook "pre-merge" &&
 | 
						|
	git branch -f side side-orig &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
 | 
						|
	setup_non_exec_hook "pre-merge" &&
 | 
						|
	git branch -f side side-orig &&
 | 
						|
	git checkout side &&
 | 
						|
	git merge --no-verify -m "merge main" main &&
 | 
						|
	git checkout main &&
 | 
						|
	test_path_is_missing actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
setup_require_prefix_hook () {
 | 
						|
	test_when_finished "rm -f expected_hooks" &&
 | 
						|
	echo require-prefix >expected_hooks &&
 | 
						|
	test_hook pre-commit <<-\EOF
 | 
						|
	echo require-prefix >>actual_hooks
 | 
						|
	test $GIT_PREFIX = "success/"
 | 
						|
	EOF
 | 
						|
}
 | 
						|
 | 
						|
test_expect_success 'with hook requiring GIT_PREFIX' '
 | 
						|
	test_when_finished "rm -rf actual_hooks success" &&
 | 
						|
	setup_require_prefix_hook &&
 | 
						|
	echo "more content" >>file &&
 | 
						|
	git add file &&
 | 
						|
	mkdir success &&
 | 
						|
	(
 | 
						|
		cd success &&
 | 
						|
		git commit -m "hook requires GIT_PREFIX = success/"
 | 
						|
	) &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'with failing hook requiring GIT_PREFIX' '
 | 
						|
	test_when_finished "rm -rf actual_hooks fail" &&
 | 
						|
	setup_require_prefix_hook &&
 | 
						|
	echo "more content" >>file &&
 | 
						|
	git add file &&
 | 
						|
	mkdir fail &&
 | 
						|
	(
 | 
						|
		cd fail &&
 | 
						|
		test_must_fail git commit -m "hook must fail"
 | 
						|
	) &&
 | 
						|
	git checkout -- file &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
setup_require_author_hook () {
 | 
						|
	test_when_finished "rm -f expected_hooks actual_hooks" &&
 | 
						|
	echo check-author >expected_hooks &&
 | 
						|
	test_hook pre-commit <<-\EOF
 | 
						|
	echo check-author >>actual_hooks
 | 
						|
	test "$GIT_AUTHOR_NAME" = "New Author" &&
 | 
						|
	test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
 | 
						|
	EOF
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
test_expect_success 'check the author in hook' '
 | 
						|
	setup_require_author_hook &&
 | 
						|
	cat >expected_hooks <<-EOF &&
 | 
						|
	check-author
 | 
						|
	check-author
 | 
						|
	check-author
 | 
						|
	EOF
 | 
						|
	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
 | 
						|
	(
 | 
						|
		GIT_AUTHOR_NAME="New Author" &&
 | 
						|
		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
 | 
						|
		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
 | 
						|
		git commit --allow-empty -m "by new.author via env" &&
 | 
						|
		git show -s
 | 
						|
	) &&
 | 
						|
	git commit --author="New Author <newauthor@example.com>" \
 | 
						|
		--allow-empty -m "by new.author via command line" &&
 | 
						|
	git show -s &&
 | 
						|
	test_cmp expected_hooks actual_hooks
 | 
						|
'
 | 
						|
 | 
						|
test_done
 |