commit 63625b3caaa100fc5a72577d70b84866c205e5d7 from: Stefan Sperling via: Thomas Adam date: Wed Jan 05 20:45:09 2022 UTC make test_cherrypick_root_commit pass with GOT_TEST_PACK=1 commit - 8c0fc3803da4d25f6a70ce44f75c6e1ccecb4758 commit + 63625b3caaa100fc5a72577d70b84866c205e5d7 blob - 98eef7348d3242c252d242a54effa1943637ea17 blob + 4d258106cb70efca804db20471b7fa4c629d627b --- 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)