diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2020-03-20 21:52:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-20 22:25:24 (GMT) |
| commit | 2da1b056744dcff1ce23e9ba2ad3dc38fe81e478 (patch) | |
| tree | 58ad626b16dc82e29355262eedb5c3852cf16864 | |
| parent | 120b1eb7314687375e0a229e102ffd194cae0e06 (diff) | |
| download | git-2da1b056744dcff1ce23e9ba2ad3dc38fe81e478.zip git-2da1b056744dcff1ce23e9ba2ad3dc38fe81e478.tar.gz git-2da1b056744dcff1ce23e9ba2ad3dc38fe81e478.tar.bz2 | |
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 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3419-rebase-patch-id.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh index 49f548c..e71560e 100755 --- a/t/t3419-rebase-patch-id.sh +++ b/t/t3419-rebase-patch-id.sh @@ -90,7 +90,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 ' } |