]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t3510-cherry-pick-sequence.sh
Merge branch 'ab/detox-gettext-tests'
[thirdparty/git.git] / t / t3510-cherry-pick-sequence.sh
index 5b94fdaa6713a2bcf7958d6630925a09fea05ed6..b76cb6de91d0dd67bb242fcad1bc88b4c8a4901f 100755 (executable)
@@ -170,7 +170,7 @@ test_expect_success 'check advice when we move HEAD by committing' '
        git commit -a &&
        test_path_is_missing .git/CHERRY_PICK_HEAD &&
        test_must_fail git cherry-pick --skip 2>advice &&
-       test_i18ncmp expect advice
+       test_cmp expect advice
 '
 
 test_expect_success 'selectively advise --skip while launching another sequence' '
@@ -182,7 +182,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
        EOF
        test_must_fail git cherry-pick picked..yetanotherpick &&
        test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-       test_i18ncmp expect advice &&
+       test_cmp expect advice &&
        cat >expect <<-EOF &&
        error: cherry-pick is already in progress
        hint: try "git cherry-pick (--continue | --abort | --quit)"
@@ -190,7 +190,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
        EOF
        git reset --merge &&
        test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-       test_i18ncmp expect advice
+       test_cmp expect advice
 '
 
 test_expect_success 'allow skipping commit but not abort for a new history' '
@@ -204,7 +204,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' '
        test_must_fail git cherry-pick anotherpick &&
        test_must_fail git cherry-pick --abort 2>advice &&
        git cherry-pick --skip &&
-       test_i18ncmp expect advice
+       test_cmp expect advice
 '
 
 test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '