[PATCH v2] t3419: prevent failure when run with EXPENSIVE
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Mar 20, 2020, 21:52 UTC
- Message-ID
- <20200320215241.609049-1-sandals@crustytoothpaste.net>
- In-Reply-To
- <20200320213916.604658-1-sandals@crustytoothpaste.net>
This test runs a function which itself runs several assertions. The last of these assertions cleans up the .git/rebase-apply directory, since when run with EXPENSIVE set, the function is invoked a second time to run the same tests with a larger data set.
However, as of 2ac0d6273f ("rebase: change the default backend from "am" to "merge"", 2020-02-15), the default backend of rebase has changed, and cleaning up the rebase-apply directory has no effect: it no longer exists, since we're using rebase-merge instead.
Since we don't really care which rebase backend is in use, let's just use the command "git rebase --quit", which will do the right thing regardless.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- t/t3419-rebase-patch-id.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh index 94552669ae..d934583776 100755 --- a/t/t3419-rebase-patch-id.sh +++ b/t/t3419-rebase-patch-id.sh @@ -91,7 +91,7 @@ do_tests () { git commit -q -m squashed && git checkout -q other^{} && test_must_fail git rebase squashed && - rm -rf .git/rebase-apply + git rebase --quit ' }