diff options
Diffstat (limited to 'third_party/git/t/t9106-git-svn-commit-diff-clobber.sh')
| -rwxr-xr-x | third_party/git/t/t9106-git-svn-commit-diff-clobber.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh index dbe8deac0d2f..aec45bca3b7b 100755 --- a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh +++ b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh @@ -92,7 +92,8 @@ test_expect_success 'multiple dcommit from git svn will not clobber svn' " test_expect_success 'check that rebase really failed' ' - test -d .git/rebase-apply + git status >output && + grep currently.rebasing output ' test_expect_success 'resolve, continue the rebase and dcommit' " |