summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2020-03-20 21:52:41 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-20 15:25:24 -0700
commit2da1b056744dcff1ce23e9ba2ad3dc38fe81e478 (patch)
tree58ad626b16dc82e29355262eedb5c3852cf16864 /t/t1002-read-tree-m-u-2way.sh
parentgit-rebase.txt: highlight backend differences with commit rewording (diff)
downloadtgif-2da1b056744dcff1ce23e9ba2ad3dc38fe81e478.tar.xz
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>
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
0 files changed, 0 insertions, 0 deletions