commit a8a244dd9f028cb4a3a7f05a51ec1bdcb96f3195
from: Stefan Sperling <stsp@stsp.name>
date: Mon Jan 03 11:50:14 2022 UTC

simpler fix equivalent to the previous commit

commit - 5988bab17145d43dfee07a7a1b779ed17c719420
commit + a8a244dd9f028cb4a3a7f05a51ec1bdcb96f3195
blob - e6d0a6d8854ace14b3d64810bc87699f6425f397
blob + ca1e787e193580d85479d0f3a60497b0559d95a8
--- 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)
 
blob - e549610920b7777c0ee0f45645bd4def7732d1fd
blob + df81db689facacce41e7257238b81e939bc87e2a
--- regress/cmdline/common.sh
+++ regress/cmdline/common.sh
@@ -128,7 +128,6 @@ git_commit_tree()
 	local msg="$2"
 	local tree="$3"
 	(cd $repo && git commit-tree -m "$msg" "$tree")
-	maybe_pack_repo $repo
 }
 
 git_fsck()