X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft3401-rebase-partial.sh;h=166ddb1447db4c33a79f0e9aea21cb00e8a151f2;hb=d9d9e6ee6366fed93a4beff3994bad376f81eabd;hp=36d9a2ae3aa7adb0bff18bb2a4180a2ba4369766;hpb=223bb84572c8b2058e175e8452913bcb1bdb0ade;p=git.git diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 36d9a2ae3..166ddb144 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -50,7 +50,7 @@ test_debug \ test_expect_success \ 'rebase topic branch against new master and check git-am did not get halted' \ - 'git-rebase master && test ! -d .git/rebase' + 'git-rebase master && test ! -d .git/rebase-apply' test_expect_success \ 'rebase --merge topic branch that was partially merged upstream' \