commit ae6fe0f7756c9c1648663b5cf027c35a4ea98774
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Wed Jan 05 20:45:09 2022 UTC

simpler fix equivalent to the previous commit

commit - 63625b3caaa100fc5a72577d70b84866c205e5d7
commit + ae6fe0f7756c9c1648663b5cf027c35a4ea98774
blob - 4d258106cb70efca804db20471b7fa4c629d627b
blob + 98eef7348d3242c252d242a54effa1943637ea17
--- regress/cmdline/cherrypick.sh
+++ regress/cmdline/cherrypick.sh
@@ -148,11 +148,7 @@ test_cherrypick_root_commit() {
 	git_commit $testroot/repo -m "committing on newbranch again"
 
 	tree=`git_show_tree $testroot/repo`
-	# new root commit will not be referenced; disable automatic packing
-	_GOT_TEST_PACK="$GOT_TEST_PACK"
-	export GOT_TEST_PACK=""
 	root_commit=`git_commit_tree $testroot/repo "new root commit" $tree`
-	export GOT_TEST_PACK="$_GOT_TEST_PACK"
 
 	(cd $testroot/wt && got cherrypick $root_commit > $testroot/stdout)