Commit a8a244dd9f028cb4a3a7f05a51ec1bdcb96f3195

Stefan Sperling 2022-01-03T11:50:14

simpler fix equivalent to the previous commit

diff --git a/regress/cmdline/cherrypick.sh b/regress/cmdline/cherrypick.sh
index e6d0a6d..ca1e787 100755
--- a/regress/cmdline/cherrypick.sh
+++ b/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)
 
diff --git a/regress/cmdline/common.sh b/regress/cmdline/common.sh
index e549610..df81db6 100644
--- a/regress/cmdline/common.sh
+++ b/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()