Commit Diff

Commit:
5988bab17145d43dfee07a7a1b779ed17c719420
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make test_cherrypick_root_commit pass with GOT_TEST_PACK=1
Actions:
Patch | Tree
commit - c861864b0f994d1b88835777932ecf8fdd78bd91
commit + 5988bab17145d43dfee07a7a1b779ed17c719420
blob - ca1e787e193580d85479d0f3a60497b0559d95a8
blob + e6d0a6d8854ace14b3d64810bc87699f6425f397
--- regress/cmdline/cherrypick.sh
+++ 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)