Commit 5988bab17145d43dfee07a7a1b779ed17c719420

Stefan Sperling 2022-01-03T11:48:22

make test_cherrypick_root_commit pass with GOT_TEST_PACK=1

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff --git a/regress/cmdline/cherrypick.sh b/regress/cmdline/cherrypick.sh
index ca1e787..e6d0a6d 100755
--- a/regress/cmdline/cherrypick.sh
+++ b/regress/cmdline/cherrypick.sh
@@ -148,7 +148,11 @@ 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)