Merge branch 'en/rebase-backend'

gitster · gitster · commit 55a756860611 · 2020-03-21T13:48:54.000-07:00
Test fix.

* en/rebase-backend:
  t3419: prevent failure when run with EXPENSIVE
diff --git 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
 	'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ do_tests () {`
`91`	`91`	`git commit -q -m squashed &&`
`92`	`92`	`git checkout -q other^{} &&`
`93`	`93`	`test_must_fail git rebase squashed &&`
`94`		`- rm -rf .git/rebase-apply`
	`94`	`+ git rebase --quit`
`95`	`95`	`'`
`96`	`96`	`}`
`97`	`97`