diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-21 13:48:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-21 13:48:54 -0700 |
| commit | 55a75686061148ea0f9b448cf6e8b0596599eff2 (patch) | |
| tree | 7c9c6dc0ffa5eab17d0db1bfc7f4bf1ec9b8d880 /t | |
| parent | c452dfa3f8c661d93fb3554041d3215628194c48 (diff) | |
| parent | 2da1b056744dcff1ce23e9ba2ad3dc38fe81e478 (diff) | |
| download | git-55a75686061148ea0f9b448cf6e8b0596599eff2.tar.gz | |
Merge branch 'en/rebase-backend'
Test fix.
* en/rebase-backend:
t3419: prevent failure when run with EXPENSIVE
Diffstat (limited to 't')
| -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 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 ' } |