Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 5cbd5ef6798bcef1c011893a4759cac4047dc6b7..796f795267dee1eaf63b10fb3e5e14ce0431bebd 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -102,7 +102,7 @@ test_expect_success 'am applies patch correctly' '
        git checkout first &&
        test_tick &&
        git am <patch1 &&
-       ! test -d .git/rebase &&
+       ! test -d .git/rebase-apply &&
        test -z "$(git diff second)" &&
        test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
        test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
@@ -123,7 +123,7 @@ test_expect_success 'am changes committer and keeps author' '
        test_tick &&
        git checkout first &&
        git am patch2 &&
-       ! test -d .git/rebase &&
+       ! test -d .git/rebase-apply &&
        test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
        test -z "$(git diff master..HEAD)" &&
        test -z "$(git diff master^..HEAD^)" &&
@@ -163,9 +163,9 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '
 test_expect_success 'am --keep really keeps the subject' '
        git checkout HEAD^ &&
        git am --keep patch4 &&
-       ! test -d .git/rebase &&
-       git-cat-file commit HEAD |
-               grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third"
+       ! test -d .git/rebase-apply &&
+       git cat-file commit HEAD |
+               fgrep "Re: Re: Re: [PATCH 1/5 v2] third"
 '
 
 test_expect_success 'am -3 falls back to 3-way merge' '
@@ -176,51 +176,51 @@ test_expect_success 'am -3 falls back to 3-way merge' '
        test_tick &&
        git commit -m "copied stuff" &&
        git am -3 lorem-move.patch &&
-       ! test -d .git/rebase &&
+       ! test -d .git/rebase-apply &&
        test -z "$(git diff lorem)"
 '
 
 test_expect_success 'am pauses on conflict' '
        git checkout lorem2^^ &&
-       ! git am lorem-move.patch &&
-       test -d .git/rebase
+       test_must_fail git am lorem-move.patch &&
+       test -d .git/rebase-apply
 '
 
 test_expect_success 'am --skip works' '
        git am --skip &&
-       ! test -d .git/rebase &&
+       ! test -d .git/rebase-apply &&
        test -z "$(git diff lorem2^^ -- file)" &&
        test goodbye = "$(cat another)"
 '
 
 test_expect_success 'am --resolved works' '
        git checkout lorem2^^ &&
-       ! git am lorem-move.patch &&
-       test -d .git/rebase &&
+       test_must_fail git am lorem-move.patch &&
+       test -d .git/rebase-apply &&
        echo resolved >>file &&
        git add file &&
        git am --resolved &&
-       ! test -d .git/rebase &&
+       ! test -d .git/rebase-apply &&
        test goodbye = "$(cat another)"
 '
 
 test_expect_success 'am takes patches from a Pine mailbox' '
        git checkout first &&
        cat pine patch1 | git am &&
-       ! test -d .git/rebase &&
+       ! test -d .git/rebase-apply &&
        test -z "$(git diff master^..HEAD)"
 '
 
 test_expect_success 'am fails on mail without patch' '
-       ! git am <failmail &&
-       rm -r .git/rebase/
+       test_must_fail git am <failmail &&
+       rm -r .git/rebase-apply/
 '
 
 test_expect_success 'am fails on empty patch' '
        echo "---" >>failmail &&
-       ! git am <failmail &&
+       test_must_fail git am <failmail &&
        git am --skip &&
-       ! test -d .git/rebase
+       ! test -d .git/rebase-apply
 '
 
 test_expect_success 'am works from stdin in subdirectory' '