Merge branch 'ab/detox-gettext-tests'

[thirdparty/git.git] / t / t3404-rebase-interactive.sh

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 28c2d15d8071207234e2f3a137346097e2d7af34..66bcbbf9528cec9e372f39be80e23fa789aabbd2 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -86,7 +86,7 @@ test_expect_success 'rebase -i with empty todo list' '
                        git rebase -i HEAD^ >output 2>&1
        ) &&
        tail -n 1 output >actual &&  # Ignore output about changing todo list
-       test_i18ncmp expect actual
+       test_cmp expect actual
 '
 
 test_expect_success 'rebase -i with the exec command' '
@@ -159,9 +159,9 @@ test_expect_success 'rebase -x with empty command fails' '
        test_when_finished "git rebase --abort ||:" &&
        test_must_fail env git rebase -x "" @ 2>actual &&
        test_write_lines "error: empty exec command" >expected &&
-       test_i18ncmp expected actual &&
+       test_cmp expected actual &&
        test_must_fail env git rebase -x " " @ 2>actual &&
-       test_i18ncmp expected actual
+       test_cmp expected actual
 '
 
 test_expect_success 'rebase -x with newline in command fails' '
@@ -169,7 +169,7 @@ test_expect_success 'rebase -x with newline in command fails' '
        test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
        test_write_lines "error: exec commands cannot contain newlines" \
                         >expected &&
-       test_i18ncmp expected actual
+       test_cmp expected actual
 '
 
 test_expect_success 'rebase -i with exec of inexistent command' '
@@ -451,7 +451,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
        grep "^ file1 | 2 +-$" output
 '
 
-test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
+test_expect_success 'multi-squash only fires up editor once' '
        base=$(git rev-parse HEAD~4) &&
        (
                set_fake_editor &&
@@ -464,7 +464,7 @@ test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
        test 1 = $(git show | grep ONCE | wc -l)
 '
 
-test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
+test_expect_success 'multi-fixup does not fire up editor' '
        git checkout -b multi-fixup E &&
        base=$(git rev-parse HEAD~4) &&
        (
@@ -515,7 +515,7 @@ test_expect_success 'commit message retained after conflict' '
        git branch -D conflict-squash
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '
+test_expect_success 'squash and fixup generate correct log messages' '
        cat >expect-squash-fixup <<-\EOF &&
        B
 
@@ -542,7 +542,7 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
        git branch -D squash-fixup
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
+test_expect_success 'squash ignores comments' '
        git checkout -b skip-comments E &&
        base=$(git rev-parse HEAD~4) &&
        (
@@ -558,7 +558,7 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
        git branch -D skip-comments
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
+test_expect_success 'squash ignores blank lines' '
        git checkout -b skip-blank-lines E &&
        base=$(git rev-parse HEAD~4) &&
        (
@@ -996,7 +996,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '
        test_cmp expected actual
 '
 
-test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
+test_expect_success 'rebase -ix with --autosquash' '
        git reset --hard execute &&
        git checkout -b autosquash &&
        echo second >second.txt &&
@@ -1137,7 +1137,7 @@ test_expect_success 'rebase -i --root reword root when root has untracked file c
        test "$(git rev-list --count HEAD)" = 2
 '
 
-test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
+test_expect_success 'rebase --edit-todo does not work on non-interactive rebase' '
        git checkout reword-original-root-branch &&
        git reset --hard &&
        git checkout conflict-branch &&
@@ -1466,7 +1466,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
                FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
        ) &&
        head -n4 actual.2 >actual &&
-       test_i18ncmp expect actual &&
+       test_cmp expect actual &&
        test D = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
@@ -1490,7 +1490,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
                set_fake_editor &&
                test_must_fail env FAKE_LINES="1 2 4" \
                        git rebase -i --root 2>actual &&
-               test_i18ncmp expect actual &&
+               test_cmp expect actual &&
                cp .git/rebase-merge/git-rebase-todo.backup \
                        .git/rebase-merge/git-rebase-todo &&
                FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
@@ -1536,11 +1536,11 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa
                cp .git/rebase-merge/git-rebase-todo.backup orig &&
                FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
                head -n6 actual.2 >actual &&
-               test_i18ncmp expect actual &&
+               test_cmp expect actual &&
                cp orig .git/rebase-merge/git-rebase-todo &&
                FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
                head -n4 actual.2 >actual &&
-               test_i18ncmp expect.3 actual &&
+               test_cmp expect.3 actual &&
                git rebase --continue 2>actual
        ) &&
        test D = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1576,16 +1576,16 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = er
                cp .git/rebase-merge/git-rebase-todo.backup orig &&
                test_must_fail env FAKE_LINES="2 3 4" \
                        git rebase --edit-todo 2>actual &&
-               test_i18ncmp expect actual &&
+               test_cmp expect actual &&
                test_must_fail git rebase --continue 2>actual &&
-               test_i18ncmp expect.2 actual &&
+               test_cmp expect.2 actual &&
                test_must_fail git rebase --edit-todo &&
                cp orig .git/rebase-merge/git-rebase-todo &&
                test_must_fail env FAKE_LINES="1 2 3 4" \
                        git rebase --edit-todo 2>actual &&
-               test_i18ncmp expect.3 actual &&
+               test_cmp expect.3 actual &&
                test_must_fail git rebase --continue 2>actual &&
-               test_i18ncmp expect.3 actual &&
+               test_cmp expect.3 actual &&
                cp orig .git/rebase-merge/git-rebase-todo &&
                FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
                git rebase --continue 2>actual