Merge branch 'ja/i18n-fix'

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 09943d6a9bb4580bbdd8f892380fdeaa0d8972da..3e73f7584ce7d3a23e7e75d0f71bd595f5f822a3 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -183,13 +183,13 @@ test_expect_success 'cherry-picked commits and fork-point work together' '
        test_commit final_B B "Final B" &&
        git rebase &&
        echo Amended >expect &&
-       test_cmp A expect &&
+       test_cmp expect A &&
        echo "Final B" >expect &&
-       test_cmp B expect &&
+       test_cmp expect B &&
        echo C >expect &&
-       test_cmp C expect &&
+       test_cmp expect C &&
        echo D >expect &&
-       test_cmp D expect
+       test_cmp expect D
 '
 
 test_expect_success 'rebase -q is quiet' '
@@ -200,10 +200,10 @@ test_expect_success 'rebase -q is quiet' '
 
 test_expect_success 'Rebase a commit that sprinkles CRs in' '
        (
-               echo "One"
-               echo "TwoQ"
-               echo "Three"
-               echo "FQur"
+               echo "One" &&
+               echo "TwoQ" &&
+               echo "Three" &&
+               echo "FQur" &&
                echo "Five"
        ) | q_to_cr >CR &&
        git add CR &&
@@ -306,7 +306,8 @@ test_expect_success 'rebase--merge.sh and --show-current-patch' '
                test_must_fail git rebase --merge --onto init HEAD^ &&
                git rebase --show-current-patch >actual.patch &&
                GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-               grep "show.*$(git rev-parse two)" stderr
+               grep "show.*REBASE_HEAD" stderr &&
+               test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
        )
 '