Skip to content

Commit 2da1b05

Browse files
bk2204gitster
authored andcommitted
t3419: prevent failure when run with EXPENSIVE
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 2ac0d62 ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 120b1eb commit 2da1b05

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t3419-rebase-patch-id.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ do_tests () {
9090
git commit -q -m squashed &&
9191
git checkout -q other^{} &&
9292
test_must_fail git rebase squashed &&
93-
rm -rf .git/rebase-apply
93+
git rebase --quit
9494
'
9595
}
9696

0 commit comments

Comments
 (0)