From 315334a96a2ed22662cbfb4e9f8a97ea9c69686d Mon Sep 17 00:00:00 2001 In-Reply-To: References: From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Mon, 24 Apr 2017 10:45:44 +0000 Subject: [PATCH] tests: remove the GETTEXT_POISON compile-time option to test i18n marking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the GETTEXT_POISON=YesPlease compile-time which turns all of git's LC_*=C output into strings like "# GETTEXT POISON #" instead of gettext(msgid). See commit bb946bba76 ("i18n: add GETTEXT_POISON to simulate unfriendly translator", 2011-02-22) for what this was originally intended for. This facility has been broken for quite a while and has been subjected to frequent bitrot. The initial idea behind it back when it was added in 2011 was to prevent the accidental translation of plumbing messages. This isn't a big concern anymore as git isn't mass-adding i18n messages for a newly developed i18n facility as it was back then, maintaining this facility incurs a burden, and in actuality this has often been broken long enough for potential plumbing messages to be translated & make their way into major releases anyway. Most of this patch consists of search/replacing the test suite for: test_i18ngrep ! -> ! grep test_i18ngrep -> grep test_i18ncmp -> test_cmp 1. (https://public-inbox.org/git/AANLkTi=5MrU-JyeQ3UVNbVwzn-8FbstUXafgcQaLWXDB@mail.gmail.com/) Signed-off-by: Ævar Arnfjörð Bjarmason --- On Mon, Apr 24, 2017 at 3:18 AM, Junio C Hamano wrote: > Michael J Gruber writes: > >> Ævar Arnfjörð Bjarmason venit, vidit, dixit 20.04.2017 23:58: >>> As a refresh of everyone's memory (because mine needed it). This is a >>> feature I added back in 2011 when the i18n support was initially >>> added. >>> >>> There was concern at the time that we would inadvertently mark >>> plumbing messages for translation, particularly something in a shared >>> code path, and this was a way to hopefully smoke out those issues with >>> the test suite. >>> >>> However compiling with it breaks a couple of dozen tests, I stopped >>> digging when I saw some broke back in 2014. >>> >>> What should be done about this? I think if we're going to keep them >>> they need to be run regularly by something like Travis (Lars CC'd), >>> however empirical evidence suggests that not running them is just fine >>> too, so should we just remove support for this test mode? >>> >>> I don't care, but I can come up with the patch either way, but would >>> only be motivated to write the one-time fix for it if some CI system >>> is actually running them regularly, otherwise they'll just be subject >>> to bitrotting again. >> >> I use that switch when I change something that involves l10n, but >> usually I run specific tests only. To be honest: I have to make sure not >> to get confused by (nor forget one of) the build flag GETTEXT_POISON and >> the environment variable GIT_GETTEXT_POISON. I'm not sure I always >> tested what I meant to test... > > To be quite honest, I have always felt that we are just as likely > inadvertently use test_i18ncmp when we should use test_cmp (and vice > versa) as we would mark plumbing messages with _() by mistake with > this approach, and even with constant monitoring by something like > Travis, GETTEXT_POISON may be able to catch mistakes only some of > the time (i.e. when we do not make mistakes in writing our tests). > Without constant monitoring, I agree that the mechanism does not > work well to catch our mistakes. Here's an alternate patch to just remove it entirely. I think we should apply this instead, the only reason I sent the patch to fix it up was because of Michael's comment that he was occasionally using it. I don't care strongly either way, but as the commit message above shows & my earlier E-Mail explains this was mostly added due to paranoia that the i18n series would subtly break stuff back in 2011, but which didn't happen, and paying the ongoing maintenance burden of this extra test mode doesn't make sense IMO either. Makefile | 9 -- .../mw-to-git/t/t9363-mw-to-git-export-import.sh | 2 +- gettext.c | 10 -- gettext.h | 11 +- git-sh-i18n.sh | 18 ---- po/README | 30 ------ t/lib-gettext.sh | 2 +- t/lib-httpd.sh | 2 +- t/lib-rebase.sh | 1 - t/t0001-init.sh | 8 +- t/t0003-attributes.sh | 2 +- t/t0006-date.sh | 2 +- t/t0008-ignores.sh | 4 +- t/t0012-help.sh | 2 +- t/t0013-sha1dc.sh | 2 +- t/t0020-crlf.sh | 5 +- t/t0040-parse-options.sh | 8 +- t/t0201-gettext-fallbacks.sh | 16 +-- t/t0205-gettext-poison.sh | 36 ------- t/t1007-hash-object.sh | 6 +- t/t1011-read-tree-sparse-checkout.sh | 2 +- t/t1060-object-corruption.sh | 2 +- t/t1200-tutorial.sh | 2 +- t/t1300-repo-config.sh | 14 +-- t/t1307-config-blob.sh | 2 +- t/t1308-config-set.sh | 8 +- t/t1400-update-ref.sh | 2 +- t/t1430-bad-ref-name.sh | 22 ++-- t/t1450-fsck.sh | 10 +- t/t1502-rev-parse-parseopt.sh | 2 +- t/t1506-rev-parse-diagnosis.sh | 10 +- t/t1507-rev-parse-upstream.sh | 10 +- t/t1512-rev-parse-disambiguation.sh | 14 +-- t/t1600-index.sh | 8 +- t/t2006-checkout-index-basic.sh | 4 +- t/t2010-checkout-ambiguous.sh | 4 +- t/t2018-checkout-branch.sh | 2 +- t/t2019-checkout-ambiguous-ref.sh | 8 +- t/t2020-checkout-detach.sh | 10 +- t/t2026-worktree-prune.sh | 10 +- t/t2030-unresolve-info.sh | 2 +- t/t2107-update-index-basic.sh | 4 +- t/t2200-add-update.sh | 2 +- t/t2204-add-ignored.sh | 8 +- t/t3004-ls-files-basic.sh | 4 +- t/t3007-ls-files-recurse-submodules.sh | 4 +- t/t3030-merge-recursive.sh | 6 +- t/t3200-branch.sh | 20 ++-- t/t3201-branch-contains.sh | 2 +- t/t3203-branch-output.sh | 12 +-- t/t3300-funny-names.sh | 2 +- t/t3310-notes-merge-manual-resolve.sh | 10 +- t/t3320-notes-merge-worktrees.sh | 4 +- t/t3400-rebase.sh | 6 +- t/t3404-rebase-interactive.sh | 22 ++-- t/t3406-rebase-message.sh | 17 +-- t/t3501-revert-cherry-pick.sh | 6 +- t/t3507-cherry-pick-conflict.sh | 6 +- t/t3508-cherry-pick-many-commits.sh | 4 +- t/t3510-cherry-pick-sequence.sh | 4 +- t/t3600-rm.sh | 24 ++--- t/t3700-add.sh | 8 +- t/t3900-i18n-commit.sh | 8 +- t/t3901-i18n-patch.sh | 2 +- t/t3903-stash.sh | 4 +- t/t4001-diff-rename.sh | 26 ++--- t/t4006-diff-mode.sh | 8 +- t/t4012-diff-binary.sh | 10 +- t/t4013-diff-various.sh | 2 +- t/t4014-format-patch.sh | 6 +- t/t4016-diff-quote.sh | 2 +- t/t4018-diff-funcname.sh | 10 +- t/t4030-diff-textconv.sh | 2 +- t/t4031-diff-rewrite-binary.sh | 2 +- t/t4045-diff-relative.sh | 2 +- t/t4047-diff-dirstat.sh | 22 ++-- t/t4049-diff-stat-count.sh | 6 +- t/t4055-diff-context.sh | 4 +- t/t4100-apply-stat.sh | 4 +- t/t4120-apply-popt.sh | 4 +- t/t4122-apply-symlink-inside.sh | 14 +-- t/t4133-apply-filenames.sh | 4 +- t/t4150-am.sh | 6 +- t/t4151-am-abort.sh | 6 +- t/t4153-am-resume-override-opts.sh | 4 +- t/t4200-rerere.sh | 4 +- t/t4202-log.sh | 12 +-- t/t4205-log-pretty-formats.sh | 4 +- t/t4208-log-magic-pathspec.sh | 4 +- t/t4212-log-corrupt.sh | 2 +- t/t4254-am-corrupt.sh | 2 +- t/t5150-request-pull.sh | 4 +- t/t5300-pack-object.sh | 4 +- t/t5310-pack-bitmaps.sh | 2 +- t/t5500-fetch-pack.sh | 6 +- t/t5505-remote.sh | 30 +++--- t/t5510-fetch.sh | 12 +-- t/t5512-ls-remote.sh | 2 +- t/t5516-fetch-push.sh | 2 +- t/t5520-pull.sh | 36 +++---- t/t5523-push-upstream.sh | 12 +-- t/t5526-fetch-submodules.sh | 34 +++--- t/t5530-upload-pack-error.sh | 4 +- t/t5534-push-signed.sh | 2 +- t/t5536-fetch-conflicts.sh | 4 +- t/t5541-http-push-smart.sh | 14 +-- t/t5545-push-options.sh | 2 +- t/t5550-http-fetch-dumb.sh | 4 +- t/t5570-git-daemon.sh | 2 +- t/t5601-clone.sh | 2 +- t/t5606-clone-options.sh | 2 +- t/t5812-proto-disable-http.sh | 4 +- t/t6022-merge-rename.sh | 16 +-- t/t6030-bisect-porcelain.sh | 28 ++--- t/t6040-tracking-info.sh | 28 ++--- t/t6042-merge-rename-corner-cases.sh | 2 +- t/t6045-merge-rename-delete.sh | 2 +- t/t6120-describe.sh | 2 +- t/t6135-pathspec-with-attrs.sh | 8 +- t/t6301-for-each-ref-errors.sh | 10 +- t/t6500-gc.sh | 8 +- t/t7001-mv.sh | 4 +- t/t7004-tag.sh | 2 +- t/t7012-skip-worktree-writing.sh | 4 +- t/t7060-wtstatus.sh | 14 +-- t/t7063-status-untracked-cache.sh | 2 +- t/t7102-reset.sh | 6 +- t/t7105-reset-patch.sh | 4 +- t/t7106-reset-unborn-branch.sh | 2 +- t/t7110-reset-merge.sh | 6 +- t/t7201-co.sh | 10 +- t/t7300-clean.sh | 6 +- t/t7400-submodule-basic.sh | 58 +++++----- t/t7401-submodule-summary.sh | 12 +-- t/t7403-submodule-sync.sh | 4 +- t/t7406-submodule-update.sh | 20 ++-- t/t7407-submodule-foreach.sh | 8 +- t/t7411-submodule-config.sh | 2 +- t/t7412-submodule-absorbgitdirs.sh | 2 +- t/t7500-commit.sh | 2 +- t/t7501-commit.sh | 6 +- t/t7502-commit.sh | 38 +++---- t/t7506-status-submodule.sh | 28 ++--- t/t7507-commit-verbose.sh | 4 +- t/t7508-status.sh | 118 ++++++++++----------- t/t7512-status-help.sh | 68 ++++++------ t/t7518-ident-corner-cases.sh | 4 +- t/t7600-merge.sh | 4 +- t/t7602-merge-octopus-many.sh | 6 +- t/t7607-merge-overwrite.sh | 4 +- t/t7609-merge-co-error-msgs.sh | 12 +-- t/t7611-merge-abort.sh | 4 +- t/t7612-merge-verify-signatures.sh | 8 +- t/t7810-grep.sh | 4 +- t/t7811-grep-open.sh | 2 +- t/t7814-grep-recurse-submodules.sh | 2 +- t/t8003-blame-corner-cases.sh | 4 +- t/t9001-send-email.sh | 2 +- t/t9300-fast-import.sh | 26 ++--- t/t9800-git-p4-basic.sh | 6 +- t/t9807-git-p4-submit.sh | 12 +-- t/t9815-git-p4-submit-fail.sh | 12 +-- t/test-lib.sh | 36 ------- 163 files changed, 697 insertions(+), 854 deletions(-) delete mode 100755 t/t0205-gettext-poison.sh diff --git a/Makefile b/Makefile index eb1a1a7cff..44b3c3116e 100644 --- a/Makefile +++ b/Makefile @@ -321,11 +321,6 @@ all:: # Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the # user. # -# Define GETTEXT_POISON if you are debugging the choice of strings marked -# for translation. In a GETTEXT_POISON build, you can turn all strings marked -# for translation into gibberish by setting the GIT_GETTEXT_POISON variable -# (to any value) in your environment. -# # Define JSMIN to point to JavaScript minifier that functions as # a filter to have gitweb.js minified. # @@ -1251,9 +1246,6 @@ endif ifdef NO_SYMLINK_HEAD BASIC_CFLAGS += -DNO_SYMLINK_HEAD endif -ifdef GETTEXT_POISON - BASIC_CFLAGS += -DGETTEXT_POISON -endif ifdef NO_GETTEXT BASIC_CFLAGS += -DNO_GETTEXT USE_GETTEXT_SCHEME ?= fallthrough @@ -2255,7 +2247,6 @@ ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT @echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@+ endif @echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@+ - @echo GETTEXT_POISON=\''$(subst ','\'',$(subst ','\'',$(GETTEXT_POISON)))'\' >>$@+ ifdef GIT_PERF_REPEAT_COUNT @echo GIT_PERF_REPEAT_COUNT=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_REPEAT_COUNT)))'\' >>$@+ endif diff --git a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh index 3ff3a09567..357eb51d27 100755 --- a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh +++ b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh @@ -160,7 +160,7 @@ test_expect_success 'git push properly warns about insufficient permissions' ' git add foo.forbidden && git commit -m "add a file" && git push 2>actual && - test_i18ngrep "foo.forbidden is not a permitted file" actual + grep "foo.forbidden is not a permitted file" actual ) ' diff --git a/gettext.c b/gettext.c index db727ea020..290ac4aa6b 100644 --- a/gettext.c +++ b/gettext.c @@ -45,16 +45,6 @@ const char *get_preferred_languages(void) return NULL; } -#ifdef GETTEXT_POISON -int use_gettext_poison(void) -{ - static int poison_requested = -1; - if (poison_requested == -1) - poison_requested = getenv("GIT_GETTEXT_POISON") ? 1 : 0; - return poison_requested; -} -#endif - #ifndef NO_GETTEXT static int test_vsnprintf(const char *fmt, ...) { diff --git a/gettext.h b/gettext.h index 7eee64a34f..0814fd87e4 100644 --- a/gettext.h +++ b/gettext.h @@ -41,24 +41,17 @@ static inline int gettext_width(const char *s) } #endif -#ifdef GETTEXT_POISON -extern int use_gettext_poison(void); -#else -#define use_gettext_poison() 0 -#endif - static inline FORMAT_PRESERVING(1) const char *_(const char *msgid) { if (!*msgid) return ""; - return use_gettext_poison() ? "# GETTEXT POISON #" : gettext(msgid); + else + return gettext(msgid); } static inline FORMAT_PRESERVING(1) FORMAT_PRESERVING(2) const char *Q_(const char *msgid, const char *plu, unsigned long n) { - if (use_gettext_poison()) - return "# GETTEXT POISON #"; return ngettext(msgid, plu, n); } diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh index 1ef1889dbd..e3d9f4836d 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh @@ -23,9 +23,6 @@ then elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" then : no probing necessary -elif test -n "$GIT_GETTEXT_POISON" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME=poison elif type gettext.sh >/dev/null 2>&1 then # GNU libintl's gettext.sh @@ -61,21 +58,6 @@ gettext_without_eval_gettext) ) } ;; -poison) - # Emit garbage so that tests that incorrectly rely on translatable - # strings will fail. - gettext () { - printf "%s" "# GETTEXT POISON #" - } - - eval_gettext () { - printf "%s" "# GETTEXT POISON #" - } - - eval_ngettext () { - printf "%s" "# GETTEXT POISON #" - } - ;; *) gettext () { printf "%s" "$1" diff --git a/po/README b/po/README index fef4c0f0b5..ecc77e2a2d 100644 --- a/po/README +++ b/po/README @@ -279,33 +279,3 @@ Perl: printf __("The following error occurred: %s\n"), $error; Run `perldoc perl/Git/I18N.pm` for more info. - - -Testing marked strings ----------------------- - -Even if you've correctly marked porcelain strings for translation -something in the test suite might still depend on the US English -version of the strings, e.g. to grep some error message or other -output. - -To smoke out issues like these Git can be compiled with gettext poison -support, at the top-level: - - make GETTEXT_POISON=YesPlease - -That'll give you a git which emits gibberish on every call to -gettext. It's obviously not meant to be installed, but you should run -the test suite with it: - - cd t && prove -j 9 ./t[0-9]*.sh - -If tests break with it you should inspect them manually and see if -what you're translating is sane, i.e. that you're not translating -plumbing output. - -If not you should replace calls to grep with test_i18ngrep, or -test_cmp calls with test_i18ncmp. If that's not enough you can skip -the whole test by making it depend on the C_LOCALE_OUTPUT -prerequisite. See existing test files with this prerequisite for -examples. diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh index eec757f104..e7772a408d 100644 --- a/t/lib-gettext.sh +++ b/t/lib-gettext.sh @@ -12,7 +12,7 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH . "$GIT_BUILD_DIR"/git-sh-i18n -if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON +if test_have_prereq GETTEXT then # is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian is_IS_locale=$(locale -a 2>/dev/null | diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 435a37465a..485a590484 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -219,7 +219,7 @@ test_http_push_nonff () { ' test_expect_success 'non-fast-forward push shows help message' ' - test_i18ngrep "Updates were rejected because" output + grep "Updates were rejected because" output ' test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' ' diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 25a77ee5cb..9a96e1566d 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -29,7 +29,6 @@ set_fake_editor () { */COMMIT_EDITMSG) test -z "$EXPECT_HEADER_COUNT" || test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" || - test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" || exit test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1" test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1" diff --git a/t/t0001-init.sh b/t/t0001-init.sh index c4814d248f..806f4e15e5 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -165,11 +165,11 @@ test_expect_success 'reinit' ' git init >out1 2>err1 && git init >out2 2>err2 ) && - test_i18ngrep "Initialized empty" again/out1 && - test_i18ngrep "Reinitialized existing" again/out2 && + grep "Initialized empty" again/out1 && + grep "Reinitialized existing" again/out2 && >again/empty && - test_i18ncmp again/empty again/err1 && - test_i18ncmp again/empty again/err2 + test_cmp again/empty again/err1 && + test_cmp again/empty again/err2 ' test_expect_success 'init with --template' ' diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index f19ae4f8cc..2d4233763d 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -224,7 +224,7 @@ test_expect_success 'root subdir attribute test' ' test_expect_success 'negative patterns' ' echo "!f test=bar" >.gitattributes && git check-attr test -- '"'"'!f'"'"' 2>errors && - test_i18ngrep "Negative patterns are ignored" errors + grep "Negative patterns are ignored" errors ' test_expect_success 'patterns starting with exclamation' ' diff --git a/t/t0006-date.sh b/t/t0006-date.sh index c0c910867d..89116eb492 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -11,7 +11,7 @@ check_relative() { echo "$t -> $2" >expect test_expect_${3:-success} "relative date ($2)" " test-date relative $t >actual && - test_i18ncmp expect actual + test_cmp expect actual " } diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index d27f438bf4..b425f3a0d2 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -34,7 +34,7 @@ expect_from_stdin () { test_stderr () { expected="$1" expect_in stderr "$1" && - test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr" + test_cmp "$HOME/expected-stderr" "$HOME/stderr" } broken_c_unquote () { @@ -47,7 +47,7 @@ broken_c_unquote_verbose () { stderr_contains () { regexp="$1" - if test_i18ngrep "$regexp" "$HOME/stderr" + if grep "$regexp" "$HOME/stderr" then return 0 else diff --git a/t/t0012-help.sh b/t/t0012-help.sh index 8faba2e8bc..7d1525060f 100755 --- a/t/t0012-help.sh +++ b/t/t0012-help.sh @@ -46,7 +46,7 @@ test_expect_success "--help does not work for guides" " git: 'revisions' is not a git command. See 'git --help'. EOF test_must_fail git revisions --help 2>actual && - test_i18ncmp expect actual + test_cmp expect actual " test_done diff --git a/t/t0013-sha1dc.sh b/t/t0013-sha1dc.sh index 6d655cb161..903dba48b6 100755 --- a/t/t0013-sha1dc.sh +++ b/t/t0013-sha1dc.sh @@ -12,7 +12,7 @@ fi test_expect_success 'test-sha1 detects shattered pdf' ' test_must_fail test-sha1 <"$TEST_DATA/shattered-1.pdf" 2>err && - test_i18ngrep collision err && + grep collision err && grep 38762cf7f55934b34d179ae6a4c80cadccbb7f0a err ' diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 71350e0657..3fe359bee9 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -84,10 +84,7 @@ test_expect_success 'safecrlf: print warning only once' ' git commit -m "nowarn" && for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn && git add doublewarn 2>err && - if test_have_prereq C_LOCALE_OUTPUT - then - test $(grep "CRLF will be replaced by LF" err | wc -l) = 1 - fi + test $(grep "CRLF will be replaced by LF" err | wc -l) = 1 ' diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 74d2cd76fe..aef5dc1dfb 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -52,7 +52,7 @@ EOF test_expect_success 'test help' ' test_must_fail test-parse-options -h >output 2>output.err && test_must_be_empty output.err && - test_i18ncmp expect output + test_cmp expect output ' mv expect expect.err @@ -75,7 +75,7 @@ check_unknown_i18n() { cat expect.err >>expect && test_must_fail test-parse-options $* >output 2>output.err && test_must_be_empty output && - test_i18ncmp expect output.err + test_cmp expect output.err } test_expect_success 'OPT_BOOL() #1' 'check boolean: 1 --yes' @@ -288,8 +288,8 @@ test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' ' test_expect_success 'OPT_CALLBACK() and callback errors work' ' test_must_fail test-parse-options --no-length >output 2>output.err && - test_i18ncmp expect output && - test_i18ncmp expect.err output.err + test_cmp expect output && + test_cmp expect.err output.err ' cat >expect <<\EOF diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh index 90da1c7ddc..6c74df0dc6 100755 --- a/t/t0201-gettext-fallbacks.sh +++ b/t/t0201-gettext-fallbacks.sh @@ -18,7 +18,7 @@ test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set' ' test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" ' -test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' ' +test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' ' echo fallthrough >expect && echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual && test_cmp expect actual @@ -27,25 +27,25 @@ test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is test_expect_success 'gettext: our gettext() fallback has pass-through semantics' ' printf "test" >expect && gettext "test" >actual && - test_i18ncmp expect actual && + test_cmp expect actual && printf "test more words" >expect && gettext "test more words" >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' ' printf "test" >expect && eval_gettext "test" >actual && - test_i18ncmp expect actual && + test_cmp expect actual && printf "test more words" >expect && eval_gettext "test more words" >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' ' printf "test YesPlease" >expect && GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' ' @@ -53,7 +53,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v export cmdline && printf "When you have resolved this problem, run git am --resolved." >expect && eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' ' @@ -61,7 +61,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v export cmdline && printf "When you have resolved this problem, run \"git am --resolved\"." >expect && eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_done diff --git a/t/t0205-gettext-poison.sh b/t/t0205-gettext-poison.sh deleted file mode 100755 index 2361590d54..0000000000 --- a/t/t0205-gettext-poison.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2010 Ævar Arnfjörð Bjarmason -# - -test_description='Gettext Shell poison' - -. ./lib-gettext.sh - -test_expect_success GETTEXT_POISON "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" ' - test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME" -' - -test_expect_success GETTEXT_POISON 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' ' - test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison" -' - -test_expect_success GETTEXT_POISON 'gettext: our gettext() fallback has poison semantics' ' - printf "# GETTEXT POISON #" >expect && - gettext "test" >actual && - test_cmp expect actual && - printf "# GETTEXT POISON #" >expect && - gettext "test more words" >actual && - test_cmp expect actual -' - -test_expect_success GETTEXT_POISON 'eval_gettext: our eval_gettext() fallback has poison semantics' ' - printf "# GETTEXT POISON #" >expect && - eval_gettext "test" >actual && - test_cmp expect actual && - printf "# GETTEXT POISON #" >expect && - eval_gettext "test more words" >actual && - test_cmp expect actual -' - -test_done diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh index 532682f51c..23e47d4549 100755 --- a/t/t1007-hash-object.sh +++ b/t/t1007-hash-object.sh @@ -196,7 +196,7 @@ done test_expect_success 'too-short tree' ' echo abc >malformed-tree && test_must_fail git hash-object -t tree malformed-tree 2>err && - test_i18ngrep "too-short tree object" err + grep "too-short tree object" err ' hex2oct() { @@ -208,7 +208,7 @@ test_expect_success 'malformed mode in tree' ' bin_sha1=$(echo $hex_sha1 | hex2oct) && printf "9100644 \0$bin_sha1" >tree-with-malformed-mode && test_must_fail git hash-object -t tree tree-with-malformed-mode 2>err && - test_i18ngrep "malformed mode in tree entry" err + grep "malformed mode in tree entry" err ' test_expect_success 'empty filename in tree' ' @@ -216,7 +216,7 @@ test_expect_success 'empty filename in tree' ' bin_sha1=$(echo $hex_sha1 | hex2oct) && printf "100644 \0$bin_sha1" >tree-with-empty-filename && test_must_fail git hash-object -t tree tree-with-empty-filename 2>err && - test_i18ngrep "empty filename in tree entry" err + grep "empty filename in tree entry" err ' test_expect_success 'corrupt commit' ' diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index c167f606ca..81e85e08d9 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -247,7 +247,7 @@ error: The following untracked working tree files would be overwritten by checko Please move or remove them before you switch branches. Aborting EOF - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'checkout without --ignore-skip-worktree-bits' ' diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh index ac1f189fd2..431a76af0c 100755 --- a/t/t1060-object-corruption.sh +++ b/t/t1060-object-corruption.sh @@ -121,7 +121,7 @@ test_expect_success 'fetch into corrupted repo with index-pack' ' cd bit-error && test_must_fail git -c transfer.unpackLimit=1 \ fetch ../no-bit-error 2>stderr && - test_i18ngrep ! -i collision stderr + ! grep -i collision stderr ) ' diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 397ccb6909..a75062cfa3 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -167,7 +167,7 @@ test_expect_success 'git resolve' ' ' test_expect_success 'git resolve output' ' - test_i18ncmp resolve.expect resolve.output + test_cmp resolve.expect resolve.output ' cat > show-branch2.expect << EOF diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index afcca0d52c..e027760117 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -447,7 +447,7 @@ test_expect_success 'get bool variable with empty value' ' test_expect_success 'no arguments, but no crash' ' test_must_fail git config >output 2>&1 && - test_i18ngrep usage output + grep usage output ' cat > .git/config << EOF @@ -700,12 +700,12 @@ test_expect_success 'invalid unit' ' git config aninvalid.unit >actual && test_cmp expect actual && test_must_fail git config --int --get aninvalid.unit 2>actual && - test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual + grep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual ' test_expect_success 'invalid stdin config' ' echo "[broken" | test_must_fail git config --list --file - >output 2>&1 && - test_i18ngrep "bad config line 1 in standard input" output + grep "bad config line 1 in standard input" output ' cat > expect << EOF @@ -886,7 +886,7 @@ test_expect_success !MINGW 'get --path copes with unset $HOME' ' git config --get --path path.normal >>result && git config --get --path path.trailingtilde >>result ) && - test_i18ngrep "[Ff]ailed to expand.*~/" msg && + grep "[Ff]ailed to expand.*~/" msg && test_cmp expect result ' @@ -1188,7 +1188,7 @@ test_expect_success 'barf on syntax error' ' key garbage EOF test_must_fail git config --get section.key >actual 2>error && - test_i18ngrep " line 3 " error + grep " line 3 " error ' test_expect_success 'barf on incomplete section header' ' @@ -1198,7 +1198,7 @@ test_expect_success 'barf on incomplete section header' ' key = value EOF test_must_fail git config --get section.key >actual 2>error && - test_i18ngrep " line 2 " error + grep " line 2 " error ' test_expect_success 'barf on incomplete string' ' @@ -1208,7 +1208,7 @@ test_expect_success 'barf on incomplete string' ' key = "value string EOF test_must_fail git config --get section.key >actual 2>error && - test_i18ngrep " line 3 " error + grep " line 3 " error ' test_expect_success 'urlmatch' ' diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh index eed31ffa30..27d59c0ecf 100755 --- a/t/t1307-config-blob.sh +++ b/t/t1307-config-blob.sh @@ -61,7 +61,7 @@ test_expect_success 'parse errors in blobs are properly attributed' ' git commit -m broken && test_must_fail git config --blob=HEAD:config some.value 2>err && - test_i18ngrep "HEAD:config" err + grep "HEAD:config" err ' test_expect_success 'can parse blob ending with CR' ' diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh index ff50960cca..3d45d847ad 100755 --- a/t/t1308-config-set.sh +++ b/t/t1308-config-set.sh @@ -126,7 +126,7 @@ test_expect_success 'find string value for a key' ' test_expect_success 'check line error when NULL string is queried' ' test_expect_code 128 test-config get_string case.foo 2>result && - test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result + grep "fatal: .*case\.foo.*\.git/config.*line 7" result ' test_expect_success 'find integer if value is non parse-able' ' @@ -197,14 +197,14 @@ test_expect_success 'proper error on error in default config files' ' echo "[" >>.git/config && echo "fatal: bad config line 34 in file .git/config" >expect && test_expect_code 128 test-config get_value foo.bar 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'proper error on error in custom config files' ' echo "[" >>syntax-error && echo "fatal: bad config line 1 in file syntax-error" >expect && test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'check line errors for malformed values' ' @@ -215,7 +215,7 @@ test_expect_success 'check line errors for malformed values' ' br EOF test_expect_code 128 git br 2>result && - test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result + grep "fatal: .*alias\.br.*\.git/config.*line 2" result ' test_expect_success 'error on modifying repo config without repo' ' diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index dc98b4bc6d..363b2dacdd 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -472,7 +472,7 @@ test_expect_success 'stdin test setup' ' test_expect_success '-z fails without --stdin' ' test_must_fail git update-ref -z $m $m $m 2>err && - test_i18ngrep "usage: git update-ref" err + grep "usage: git update-ref" err ' test_expect_success 'stdin works with no input' ' diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index 8937e25e49..07ac1f2e78 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@ -42,7 +42,7 @@ test_expect_success 'git branch shows badly named ref as warning' ' cp .git/refs/heads/master .git/refs/heads/broken...ref && test_when_finished "rm -f .git/refs/heads/broken...ref" && git branch >output 2>error && - test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && + grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" output ' @@ -152,7 +152,7 @@ test_expect_success 'rev-parse skips symref pointing to broken name' ' git rev-parse --verify one >expect && git rev-parse --verify shadow >actual 2>err && test_cmp expect actual && - test_i18ngrep "ignoring dangling symref refs/tags/shadow" err + grep "ignoring dangling symref refs/tags/shadow" err ' test_expect_success 'for-each-ref emits warnings for broken names' ' @@ -166,9 +166,9 @@ test_expect_success 'for-each-ref emits warnings for broken names' ' ! grep -e "broken\.\.\.ref" output && ! grep -e "badname" output && ! grep -e "broken\.\.\.symref" output && - test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && - test_i18ngrep "ignoring broken ref refs/heads/badname" error && - test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error + grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && + grep "ignoring broken ref refs/heads/badname" error && + grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error ' test_expect_success 'update-ref -d can delete broken name' ' @@ -186,7 +186,7 @@ test_expect_success 'branch -d can delete broken name' ' cp .git/refs/heads/master .git/refs/heads/broken...ref && test_when_finished "rm -f .git/refs/heads/broken...ref" && git branch -d broken...ref >output 2>error && - test_i18ngrep "Deleted branch broken...ref (was broken)" output && + grep "Deleted branch broken...ref (was broken)" output && test_must_be_empty error && git branch >output 2>error && ! grep -e "broken\.\.\.ref" error && @@ -211,7 +211,7 @@ test_expect_success 'branch -d can delete symref to broken name' ' test_when_finished "rm -f .git/refs/heads/badname" && git branch -d badname >output 2>error && test_path_is_missing .git/refs/heads/badname && - test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && + grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && test_must_be_empty error ' @@ -229,7 +229,7 @@ test_expect_success 'branch -d can delete dangling symref to broken name' ' test_when_finished "rm -f .git/refs/heads/badname" && git branch -d badname >output 2>error && test_path_is_missing .git/refs/heads/badname && - test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && + grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && test_must_be_empty error ' @@ -258,7 +258,7 @@ test_expect_success 'branch -d can delete symref with broken name' ' test_when_finished "rm -f .git/refs/heads/broken...symref" && git branch -d broken...symref >output 2>error && test_path_is_missing .git/refs/heads/broken...symref && - test_i18ngrep "Deleted branch broken...symref (was refs/heads/master)" output && + grep "Deleted branch broken...symref (was refs/heads/master)" output && test_must_be_empty error ' @@ -276,7 +276,7 @@ test_expect_success 'branch -d can delete dangling symref with broken name' ' test_when_finished "rm -f .git/refs/heads/broken...symref" && git branch -d broken...symref >output 2>error && test_path_is_missing .git/refs/heads/broken...symref && - test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output && + grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output && test_must_be_empty error ' @@ -285,7 +285,7 @@ test_expect_success 'update-ref -d cannot delete non-ref in .git dir' ' echo precious >expect && test_must_fail git update-ref -d my-private-file >output 2>error && test_must_be_empty output && - test_i18ngrep -e "refusing to update ref with bad name" error && + grep -e "refusing to update ref with bad name" error && test_cmp expect .git/my-private-file ' diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 677e15a7a4..e43c1bef4e 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -217,9 +217,9 @@ test_expect_success 'unparseable tree object' ' commit_sha1=$(git commit-tree $tree_sha1) && git update-ref refs/heads/wrong $commit_sha1 && test_must_fail git fsck 2>out && - test_i18ngrep "error: empty filename in tree entry" out && - test_i18ngrep "$tree_sha1" out && - test_i18ngrep ! "fatal: empty filename in tree entry" out + grep "error: empty filename in tree entry" out && + grep "$tree_sha1" out && + ! grep "fatal: empty filename in tree entry" out ' test_expect_success 'tag pointing to nonexistent' ' @@ -633,7 +633,7 @@ test_expect_success 'fsck detects trailing loose garbage (commit)' ' chmod +w "$file" && echo garbage >>"$file" && test_must_fail git fsck 2>out && - test_i18ngrep "garbage.*$commit" out + grep "garbage.*$commit" out ' test_expect_success 'fsck detects trailing loose garbage (blob)' ' @@ -643,7 +643,7 @@ test_expect_success 'fsck detects trailing loose garbage (blob)' ' chmod +w "$file" && echo garbage >>"$file" && test_must_fail git fsck 2>out && - test_i18ngrep "garbage.*$blob" out + grep "garbage.*$blob" out ' # for each of type, we have one version which is referenced by another object diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh index 310f93fd30..a9c7204655 100755 --- a/t/t1502-rev-parse-parseopt.sh +++ b/t/t1502-rev-parse-parseopt.sh @@ -70,7 +70,7 @@ test_expect_success 'test --parseopt help output' ' |EOF END_EXPECT test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'setup expect.1' " diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh index 79a0251efa..5347d1d3b6 100755 --- a/t/t1506-rev-parse-diagnosis.sh +++ b/t/t1506-rev-parse-diagnosis.sh @@ -106,7 +106,7 @@ test_expect_success 'incorrect revision id' ' test_must_fail git rev-parse foobar:file.txt 2>error && grep "Invalid object name '"'"'foobar'"'"'." error && test_must_fail git rev-parse foobar 2> error && - test_i18ngrep "unknown revision or path not in the working tree." error + grep "unknown revision or path not in the working tree." error ' test_expect_success 'incorrect file in sha1:path' ' @@ -168,8 +168,8 @@ test_expect_success 'relative path when cwd is outside worktree' ' test_expect_success ':file correctly diagnosed after a pathname' ' test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error && - test_i18ngrep ! "exists on disk" error && - test_i18ngrep "no such path in the working tree" error && + ! grep "exists on disk" error && + grep "no such path in the working tree" error && cat >expect <<-\EOF && file.txt HEAD:file.txt @@ -193,13 +193,13 @@ test_expect_success 'dotdot is not an empty set' ' test_expect_success 'arg before dashdash must be a revision (missing)' ' test_must_fail git rev-parse foobar -- 2>stderr && - test_i18ngrep "bad revision" stderr + grep "bad revision" stderr ' test_expect_success 'arg before dashdash must be a revision (file)' ' >foobar && test_must_fail git rev-parse foobar -- 2>stderr && - test_i18ngrep "bad revision" stderr + grep "bad revision" stderr ' test_expect_success 'arg before dashdash must be a revision (ambiguous)' ' diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index b23c4e3fab..53ee07263a 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -160,7 +160,7 @@ test_expect_success 'branch@{u} error message when no upstream' ' fatal: no upstream configured for branch ${sq}non-tracking${sq} EOF error_message non-tracking@{u} 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success '@{u} error message when no upstream' ' @@ -168,7 +168,7 @@ test_expect_success '@{u} error message when no upstream' ' fatal: no upstream configured for branch ${sq}master${sq} EOF test_must_fail git rev-parse --verify @{u} 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'branch@{u} error message with misspelt branch' ' @@ -176,7 +176,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' ' fatal: no such branch: ${sq}no-such-branch${sq} EOF error_message no-such-branch@{u} 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success '@{u} error message when not on a branch' ' @@ -185,7 +185,7 @@ test_expect_success '@{u} error message when not on a branch' ' EOF git checkout HEAD^0 && test_must_fail git rev-parse --verify @{u} 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'branch@{u} error message if upstream branch not fetched' ' @@ -193,7 +193,7 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' ' fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch EOF error_message bad-upstream@{u} 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'pull works when tracking a local branch' ' diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 711704ba5a..2ed77868d0 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -42,7 +42,7 @@ test_expect_success 'blob and tree' ' test_expect_success 'warn ambiguity when no candidate matches type hint' ' test_must_fail git rev-parse --verify 000000000^{commit} 2>actual && - test_i18ngrep "short SHA1 000000000 is ambiguous" actual + grep "short SHA1 000000000 is ambiguous" actual ' test_expect_success 'disambiguate tree-ish' ' @@ -305,39 +305,39 @@ test_expect_success 'ambiguous short sha1 ref' ' grep "refname.*${REF}.*ambiguous" err ' -test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (raw)' ' +test_expect_success 'ambiguity errors are not repeated (raw)' ' test_must_fail git rev-parse 00000 2>stderr && grep "is ambiguous" stderr >errors && test_line_count = 1 errors ' -test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (treeish)' ' +test_expect_success 'ambiguity errors are not repeated (treeish)' ' test_must_fail git rev-parse 00000:foo 2>stderr && grep "is ambiguous" stderr >errors && test_line_count = 1 errors ' -test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (peel)' ' +test_expect_success 'ambiguity errors are not repeated (peel)' ' test_must_fail git rev-parse 00000^{commit} 2>stderr && grep "is ambiguous" stderr >errors && test_line_count = 1 errors ' -test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' ' +test_expect_success 'ambiguity hints' ' test_must_fail git rev-parse 000000000 2>stderr && grep ^hint: stderr >hints && # 16 candidates, plus one intro line test_line_count = 17 hints ' -test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' ' +test_expect_success 'ambiguity hints respect type' ' test_must_fail git rev-parse 000000000^{commit} 2>stderr && grep ^hint: stderr >hints && # 5 commits, 1 tag (which is a commitish), plus intro line test_line_count = 7 hints ' -test_expect_success C_LOCALE_OUTPUT 'failed type-selector still shows hint' ' +test_expect_success 'failed type-selector still shows hint' ' # these two blobs share the same prefix "ee3d", but neither # will pass for a commit echo 851 | git hash-object --stdin -w && diff --git a/t/t1600-index.sh b/t/t1600-index.sh index 079d241145..f9d6f484f1 100755 --- a/t/t1600-index.sh +++ b/t/t1600-index.sh @@ -18,7 +18,7 @@ test_expect_success 'bogus GIT_INDEX_VERSION issues warning' ' warning: GIT_INDEX_VERSION set, but the value is invalid. Using version Z EOF - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ) ' @@ -32,7 +32,7 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' ' warning: GIT_INDEX_VERSION set, but the value is invalid. Using version Z EOF - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ) ' @@ -42,7 +42,7 @@ test_expect_success 'no warning with bogus GIT_INDEX_VERSION and existing index' export GIT_INDEX_VERSION && git add a 2>actual.err && >expect.err && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ) ' @@ -56,7 +56,7 @@ test_expect_success 'out of bounds index.version issues warning' ' warning: index.version set, but the value is invalid. Using version Z EOF - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ) ' diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh index 57cbdfe9bc..b8559838b1 100755 --- a/t/t2006-checkout-index-basic.sh +++ b/t/t2006-checkout-index-basic.sh @@ -7,7 +7,7 @@ test_description='basic checkout-index tests test_expect_success 'checkout-index --gobbledegook' ' test_expect_code 129 git checkout-index --gobbledegook 2>err && - test_i18ngrep "[Uu]sage" err + grep "[Uu]sage" err ' test_expect_success 'checkout-index -h in broken repository' ' @@ -18,7 +18,7 @@ test_expect_success 'checkout-index -h in broken repository' ' >.git/index && test_expect_code 129 git checkout-index -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + grep "[Uu]sage" broken/usage ' test_done diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh index 2e47fe01cf..afa979fedc 100755 --- a/t/t2010-checkout-ambiguous.sh +++ b/t/t2010-checkout-ambiguous.sh @@ -58,8 +58,8 @@ test_expect_success 'disambiguate checking out from a tree-ish' ' test_expect_success 'accurate error message with more than one ref' ' test_must_fail git checkout HEAD master -- 2>actual && - test_i18ngrep 2 actual && - test_i18ngrep "one reference expected, 2 given" actual + grep 2 actual && + grep "one reference expected, 2 given" actual ' test_done diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 2131fb2a56..2741262369 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -124,7 +124,7 @@ test_expect_success 'checkout -b to @{-1} fails with the right branch name' ' git checkout branch2 && echo >expect "fatal: A branch named '\''branch1'\'' already exists." && test_must_fail git checkout -b @{-1} 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'checkout -B to an existing branch resets branch to HEAD' ' diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index b99d5192a9..943541d40d 100755 --- a/t/t2019-checkout-ambiguous-ref.sh +++ b/t/t2019-checkout-ambiguous-ref.sh @@ -30,8 +30,8 @@ test_expect_success 'checkout chooses branch over tag' ' ' test_expect_success 'checkout reports switch to branch' ' - test_i18ngrep "Switched to branch" stderr && - test_i18ngrep ! "^HEAD is now at" stderr + grep "Switched to branch" stderr && + ! grep "^HEAD is now at" stderr ' test_expect_success 'checkout vague ref succeeds' ' @@ -52,8 +52,8 @@ test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' ' ' test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' ' - test_i18ngrep "Switched to branch" stderr && - test_i18ngrep ! "^HEAD is now at" stderr + grep "Switched to branch" stderr && + ! grep "^HEAD is now at" stderr ' test_done diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index fbb4ee9bb4..fa1a4639ec 100755 --- a/t/t2020-checkout-detach.sh +++ b/t/t2020-checkout-detach.sh @@ -13,12 +13,12 @@ check_not_detached () { PREV_HEAD_DESC='Previous HEAD position was' check_orphan_warning() { - test_i18ngrep "you are leaving $2 behind" "$1" && - test_i18ngrep ! "$PREV_HEAD_DESC" "$1" + grep "you are leaving $2 behind" "$1" && + ! grep "$PREV_HEAD_DESC" "$1" } check_no_orphan_warning() { - test_i18ngrep ! "you are leaving .* commit.*behind" "$1" && - test_i18ngrep "$PREV_HEAD_DESC" "$1" + ! grep "you are leaving .* commit.*behind" "$1" && + grep "$PREV_HEAD_DESC" "$1" } reset () { @@ -160,7 +160,7 @@ test_expect_success 'tracking count is accurate after orphan check' ' git config branch.child.merge refs/heads/master && git checkout child^ && git checkout child >stdout && - test_i18ncmp expect stdout + test_cmp expect stdout ' test_expect_success 'no advice given for explicit detached head state' ' diff --git a/t/t2026-worktree-prune.sh b/t/t2026-worktree-prune.sh index a0f1e3bb80..c3083dd344 100755 --- a/t/t2026-worktree-prune.sh +++ b/t/t2026-worktree-prune.sh @@ -20,7 +20,7 @@ test_expect_success 'prune files inside $GIT_DIR/worktrees' ' cat >expect <actual && - test_i18ncmp expect actual && + test_cmp expect actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' @@ -43,7 +43,7 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' ' : >.git/worktrees/def/gitdir && chmod u-r .git/worktrees/def/gitdir && git worktree prune --verbose >actual && - test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual && + grep "Removing worktrees/def: unable to read gitdir file" actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' @@ -53,7 +53,7 @@ test_expect_success 'prune directories with invalid gitdir' ' : >.git/worktrees/def/def && : >.git/worktrees/def/gitdir && git worktree prune --verbose >actual && - test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual && + grep "Removing worktrees/def: invalid gitdir file" actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' @@ -63,7 +63,7 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' ' : >.git/worktrees/def/def && echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir && git worktree prune --verbose >actual && - test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual && + grep "Removing worktrees/def: gitdir file points to non-existent location" actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh index 309199bca2..d7745ac4b6 100755 --- a/t/t2030-unresolve-info.sh +++ b/t/t2030-unresolve-info.sh @@ -189,7 +189,7 @@ test_expect_success 'rerere forget (add-add conflict)' ' git commit -m "add differently" && test_must_fail git merge fifth && git rerere forget add-differently 2>actual && - test_i18ngrep "no remembered" actual + grep "no remembered" actual ' test_done diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 32ac6e09bd..9ea2883f81 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -15,7 +15,7 @@ test_expect_success 'update-index --nonsense fails' ' test_expect_success 'update-index --nonsense dumps usage' ' test_expect_code 129 git update-index --nonsense 2>err && - test_i18ngrep "[Uu]sage: git update-index" err + grep "[Uu]sage: git update-index" err ' test_expect_success 'update-index -h with corrupt index' ' @@ -26,7 +26,7 @@ test_expect_success 'update-index -h with corrupt index' ' >.git/index && test_expect_code 129 git update-index -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage: git update-index" broken/usage + grep "[Uu]sage: git update-index" broken/usage ' test_expect_success '--cacheinfo complains of missing arguments' ' diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 314c73c5a7..a6c29bfd79 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -136,7 +136,7 @@ test_expect_success 'add -n -u should not add but just report' ' after=$(git ls-files -s check top) && test "$before" = "$after" && - test_i18ncmp expect actual + test_cmp expect actual ' diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh index 8340ac2f07..902d16c531 100755 --- a/t/t2204-add-ignored.sh +++ b/t/t2204-add-ignored.sh @@ -35,7 +35,7 @@ do ' test_expect_success "complaints for ignored $i output" ' - test_i18ngrep -e "Use -f if" err + grep -e "Use -f if" err ' test_expect_success "complaints for ignored $i with unignored file" ' @@ -45,7 +45,7 @@ do ! test -s out ' test_expect_success "complaints for ignored $i with unignored file output" ' - test_i18ngrep -e "Use -f if" err + grep -e "Use -f if" err ' done @@ -64,7 +64,7 @@ do test_expect_success "complaints for ignored $i in dir output" ' ( cd dir && - test_i18ngrep -e "Use -f if" err + grep -e "Use -f if" err ) ' done @@ -84,7 +84,7 @@ do test_expect_success "complaints for ignored $i in sub output" ' ( cd sub && - test_i18ngrep -e "Use -f if" err + grep -e "Use -f if" err ) ' done diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh index 9c7adbdbe1..819b344586 100755 --- a/t/t3004-ls-files-basic.sh +++ b/t/t3004-ls-files-basic.sh @@ -22,7 +22,7 @@ test_expect_success 'ls-files with nonexistent path' ' test_expect_success 'ls-files with nonsense option' ' test_expect_code 129 git ls-files --nonsense 2>actual && - test_i18ngrep "[Uu]sage: git ls-files" actual + grep "[Uu]sage: git ls-files" actual ' test_expect_success 'ls-files -h in corrupt repository' ' @@ -33,7 +33,7 @@ test_expect_success 'ls-files -h in corrupt repository' ' >.git/index && test_expect_code 129 git ls-files -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage: git ls-files " broken/usage + grep "[Uu]sage: git ls-files " broken/usage ' test_expect_success SYMLINKS 'ls-files with absolute paths to symlinks' ' diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh index ebb956fd16..f1b68aeeb3 100755 --- a/t/t3007-ls-files-recurse-submodules.sh +++ b/t/t3007-ls-files-recurse-submodules.sh @@ -241,13 +241,13 @@ test_expect_success '--recurse-submodules and relative paths' ' test_expect_success '--recurse-submodules does not support --error-unmatch' ' test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual && - test_i18ngrep "does not support --error-unmatch" actual + grep "does not support --error-unmatch" actual ' test_incompatible_with_recurse_submodules () { test_expect_success "--recurse-submodules and $1 are incompatible" " test_must_fail git ls-files --recurse-submodules $1 2>actual && - test_i18ngrep 'unsupported mode' actual + grep 'unsupported mode' actual " } diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 9a893b5fe7..555007d577 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -304,13 +304,13 @@ test_expect_success 'fail if the index has unresolved entries' ' test_must_fail git merge "$c5" && test_must_fail git merge "$c5" 2> out && - test_i18ngrep "not possible because you have unmerged files" out && + grep "not possible because you have unmerged files" out && git add -u && test_must_fail git merge "$c5" 2> out && - test_i18ngrep "You have not concluded your merge" out && + grep "You have not concluded your merge" out && rm -f .git/MERGE_HEAD && test_must_fail git merge "$c5" 2> out && - test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out + grep "Your local changes to the following files would be overwritten by merge:" out ' test_expect_success 'merge-recursive remove conflict' ' diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index fe62e7c775..27e024d83e 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -30,7 +30,7 @@ test_expect_success 'branch -h in broken repository' ' >.git/refs/heads/master && test_expect_code 129 git branch -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + grep "[Uu]sage" broken/usage ' test_expect_success 'git branch abc should create a branch' ' @@ -76,7 +76,7 @@ test_expect_success 'git branch l should work after branch l/m has been deleted' test_expect_success 'git branch -m dumps usage' ' test_expect_code 128 git branch -m 2>err && - test_i18ngrep "branch name required" err + grep "branch name required" err ' test_expect_success 'git branch -m m broken_symref should work' ' @@ -348,7 +348,7 @@ test_expect_success 'deleting a symref' ' git branch -d symref >actual && test_path_is_file .git/refs/heads/target && test_path_is_missing .git/refs/heads/symref && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'deleting a dangling symref' ' @@ -357,7 +357,7 @@ test_expect_success 'deleting a dangling symref' ' echo "Deleted branch dangling-symref (was nowhere)." >expect && git branch -d dangling-symref >actual && test_path_is_missing .git/refs/heads/dangling-symref && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'deleting a self-referential symref' ' @@ -366,7 +366,7 @@ test_expect_success 'deleting a self-referential symref' ' echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect && git branch -d self-reference >actual && test_path_is_missing .git/refs/heads/self-reference && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'renaming a symref is not allowed' ' @@ -461,7 +461,7 @@ test_expect_success 'test deleting branch without config' ' sha1=$(git rev-parse my7 | cut -c 1-7) && echo "Deleted branch my7 (was $sha1)." >expect && git branch -d my7 >actual 2>&1 && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'deleting currently checked out branch fails' ' @@ -590,7 +590,7 @@ If you wanted to make '"'master'"' track '"'origin/master'"', do this: git branch -d origin/master git branch --set-upstream-to origin/master EOF - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success '--set-upstream with two args only shows the deprecation message' ' @@ -599,7 +599,7 @@ test_expect_success '--set-upstream with two args only shows the deprecation mes cat >expected <expected <actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'git branch shows detached HEAD properly after checkout --detach' ' @@ -121,7 +121,7 @@ test_expect_success 'git branch shows detached HEAD properly after checkout --de EOF git checkout --detach && git branch >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'git branch shows detached HEAD properly after moving' ' @@ -133,7 +133,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving' ' EOF git reset --hard HEAD^1 && git branch >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'git branch shows detached HEAD properly from tag' ' @@ -146,7 +146,7 @@ EOF git tag fromtag master && git checkout fromtag && git branch >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'git branch shows detached HEAD properly after moving from tag' ' @@ -158,7 +158,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving from t EOF git reset --hard HEAD^1 && git branch >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'git branch `--sort` option' ' @@ -169,7 +169,7 @@ test_expect_success 'git branch `--sort` option' ' master EOF git branch --sort=objectsize >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'git branch --points-at option' ' diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh index 04de03cad0..f5bf16abcd 100755 --- a/t/t3300-funny-names.sh +++ b/t/t3300-funny-names.sh @@ -181,7 +181,7 @@ test_expect_success 'diffstat for rename quotes funny filename' ' git diff-index -M -p $t0 >diff && git apply --stat diffstat && sed -e "s/|.*//" -e "s/ *\$//" current && - test_i18ncmp expected current + test_cmp expected current ' test_expect_success 'numstat for rename quotes funny filename' ' diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index baef2d6924..0924684a28 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -178,7 +178,7 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C git config core.notesRef refs/notes/m && test_must_fail git notes merge z >output && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -225,7 +225,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish test -d .git/NOTES_MERGE_WORKTREE && test_must_fail git notes merge z >output 2>&1 && # Output should indicate what is wrong - test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output + grep -q "\\.git/NOTES_MERGE_\\* exists" output ' # Setup non-conflicting merge between x and new notes ref w @@ -381,7 +381,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol git config core.notesRef refs/notes/m && test_must_fail git notes merge z >output && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -415,7 +415,7 @@ git rev-parse refs/notes/z > pre_merge_z test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' ' test_must_fail git notes merge z >output && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -496,7 +496,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol git update-ref refs/notes/m refs/notes/y && test_must_fail git notes merge z >output && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index b9c3bc2487..0545976cd9 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' ' cd worktree && git config core.notesRef refs/notes/y && test_must_fail git notes merge z 2>err && - test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err + grep "a notes merge into refs/notes/y is already in-progress at" err ) && test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF ' @@ -62,7 +62,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' ' cd worktree2 && git config core.notesRef refs/notes/x && test_must_fail git notes merge z 2>&1 >out && - test_i18ngrep "Automatic notes merge failed" out && + grep "Automatic notes merge failed" out && grep -v "A notes merge into refs/notes/x is already in-progress in" out ) && echo "ref: refs/notes/x" >expect && diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index f5fd15e559..200aadc9a5 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -102,7 +102,7 @@ test_expect_success 'rebase off of the previous branch using "-"' ' test_cmp expect.forkpoint actual.forkpoint && # the next one is dubious---we may want to say "-", # instead of @{-1}, in the message - test_i18ncmp expect.messages actual.messages + test_cmp expect.messages actual.messages ' test_expect_success 'rebase a single mode change' ' @@ -136,8 +136,8 @@ test_expect_success 'setup: recover' ' test_expect_success 'Show verbose error when HEAD could not be detached' ' >B && test_must_fail git rebase topic 2>output.err >output.out && - test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err && - test_i18ngrep B output.err + grep "The following untracked working tree files would be overwritten by checkout:" output.err && + grep B output.err ' rm -f B diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 33d392ba11..62645f6e88 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -219,9 +219,9 @@ test_expect_success 'abort with error when new base cannot be checked out' ' git commit -m "remove file in base" && set_fake_editor && test_must_fail git rebase -i master > output 2>&1 && - test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \ + grep "The following untracked working tree files would be overwritten by checkout:" \ output && - test_i18ngrep "file1" output && + grep "file1" output && test_path_is_missing .git/rebase-merge && git reset --hard HEAD^ ' @@ -556,7 +556,7 @@ test_expect_success 'clean error after failed "exec"' ' echo "edited again" > file7 && git add file7 && test_must_fail git rebase --continue 2>error && - test_i18ngrep "you have staged changes in your working tree" error + grep "you have staged changes in your working tree" error ' test_expect_success 'rebase a detached HEAD' ' @@ -889,7 +889,7 @@ test_expect_success 'rebase --exec works without -i ' ' git reset --hard execute && rm -rf exec_output && EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output" HEAD~2 2>actual && - test_i18ngrep "Successfully rebased and updated" actual && + grep "Successfully rebased and updated" actual && test_line_count = 2 exec_output && test_path_is_missing invoked_editor ' @@ -1087,7 +1087,7 @@ test_expect_success 'todo count' ' EOF test_set_editor "$(pwd)/dump-raw.sh" && git rebase -i HEAD~4 >actual && - test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual + grep "^# Rebase ..* onto ..* ([0-9]" actual ' test_expect_success 'rebase -i commits that overwrite untracked files (pick)' ' @@ -1187,7 +1187,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' ' FAKE_LINES="1 2 3 4" \ git rebase -i --root 2>actual && test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ncmp expect actual + test_cmp expect actual ' cat >expect <actual && - test_i18ncmp expect actual && + test_cmp expect actual && test D = $(git cat-file commit HEAD | sed -ne \$p) ' @@ -1232,7 +1232,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" \ @@ -1255,7 +1255,7 @@ test_expect_success 'static check of bad command' ' set_fake_editor && test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ git rebase -i --root 2>actual && - test_i18ncmp expect actual && + test_cmp expect actual && FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo && git rebase --continue && test E = $(git cat-file commit HEAD | sed -ne \$p) && @@ -1290,7 +1290,7 @@ test_expect_success 'static check of bad SHA-1' ' set_fake_editor && test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \ git rebase -i --root 2>actual && - test_i18ncmp expect actual && + test_cmp expect actual && FAKE_LINES="1 2 4 5 6" git rebase --edit-todo && git rebase --continue && test E = $(git cat-file commit HEAD | sed -ne \$p) @@ -1313,7 +1313,7 @@ test_expect_success 'rebase -i --gpg-sign=' ' set_fake_editor && FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \ >out 2>err && - test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err + grep "$SQ-S\"S I Gner\"$SQ" err ' test_done diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 0392e36d23..4ad3f36e63 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -32,24 +32,24 @@ test_expect_success 'rebase -m' ' test_expect_success 'rebase against master twice' ' git rebase master >out && - test_i18ngrep "Current branch topic is up to date" out + grep "Current branch topic is up to date" out ' test_expect_success 'rebase against master twice with --force' ' git rebase --force-rebase master >out && - test_i18ngrep "Current branch topic is up to date, rebase forced" out + grep "Current branch topic is up to date, rebase forced" out ' test_expect_success 'rebase against master twice from another branch' ' git checkout topic^ && git rebase master topic >out && - test_i18ngrep "Current branch topic is up to date" out + grep "Current branch topic is up to date" out ' test_expect_success 'rebase fast-forward to master' ' git checkout topic^ && git rebase topic >out && - test_i18ngrep "Fast-forwarded HEAD to topic" out + grep "Fast-forwarded HEAD to topic" out ' test_expect_success 'rebase --stat' ' @@ -72,16 +72,9 @@ test_expect_success 'rebase -n overrides config rebase.stat config' ' ! grep "^ fileX | *1 +$" diffstat.txt ' -# Output to stderr: -# -# "Does not point to a valid commit: invalid-ref" -# -# NEEDSWORK: This "grep" is fine in real non-C locales, but -# GETTEXT_POISON poisons the refname along with the enclosing -# error message. test_expect_success 'rebase --onto outputs the invalid ref' ' test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && - test_i18ngrep "invalid-ref" err + grep "invalid-ref" err ' test_done diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 4f2a263b63..988af96bf4 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -47,7 +47,7 @@ test_expect_success 'cherry-pick --nonsense' ' git diff --exit-code HEAD && test_must_fail git cherry-pick --nonsense 2>msg && git diff --exit-code HEAD "$pos" && - test_i18ngrep '[Uu]sage:' msg + grep '[Uu]sage:' msg ' test_expect_success 'revert --nonsense' ' @@ -56,7 +56,7 @@ test_expect_success 'revert --nonsense' ' git diff --exit-code HEAD && test_must_fail git revert --nonsense 2>msg && git diff --exit-code HEAD "$pos" && - test_i18ngrep '[Uu]sage:' msg + grep '[Uu]sage:' msg ' test_expect_success 'cherry-pick after renaming branch' ' @@ -96,7 +96,7 @@ test_expect_success 'revert forbidden on dirty working tree' ' echo content >extra_file && git add extra_file && test_must_fail git revert HEAD 2>errors && - test_i18ngrep "your local changes would be overwritten by " errors + grep "your local changes would be overwritten by " errors ' diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 7c5ad08626..9e612d417c 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -51,7 +51,7 @@ test_expect_success 'advice from failed cherry-pick' " EOF test_must_fail git cherry-pick picked 2>actual && - test_i18ncmp expected actual + test_cmp expected actual " test_expect_success 'advice from failed cherry-pick --no-commit' " @@ -65,7 +65,7 @@ test_expect_success 'advice from failed cherry-pick --no-commit' " EOF test_must_fail git cherry-pick --no-commit picked 2>actual && - test_i18ncmp expected actual + test_cmp expected actual " test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' ' @@ -338,7 +338,7 @@ test_expect_success 'revert conflict, diff3 -m style' ' test_expect_success 'failed cherry-pick does not forget -s' ' pristine_detach initial && test_must_fail git cherry-pick -s picked && - test_i18ngrep -e "Signed-off-by" .git/MERGE_MSG + grep -e "Signed-off-by" .git/MERGE_MSG ' test_expect_success 'commit after failed cherry-pick does not add duplicated -s' ' diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index b457333e18..59b99f0818 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -83,7 +83,7 @@ test_expect_success 'output to keep user entertained during multi-pick' ' git cherry-pick first..fourth >actual && sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" actual.fuzzy && test_line_count -ge 3 actual.fuzzy && - test_i18ncmp expected actual.fuzzy + test_cmp expected actual.fuzzy ' test_expect_success 'cherry-pick --strategy resolve first..fourth works' ' @@ -120,7 +120,7 @@ test_expect_success 'output during multi-pick indicates merge strategy' ' test_tick && git cherry-pick --strategy resolve first..fourth >actual && sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" actual.fuzzy && - test_i18ncmp expected actual.fuzzy + test_cmp expected actual.fuzzy ' test_expect_success 'cherry-pick --ff first..fourth works' ' diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 0acf4b1461..7b06e04af8 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -153,7 +153,7 @@ test_expect_success '--abort does not unsafely change HEAD' ' git reset --hard base && test_must_fail git cherry-pick picked anotherpick && git cherry-pick --abort 2>actual && - test_i18ngrep "You seem to have moved HEAD" actual && + grep "You seem to have moved HEAD" actual && test_cmp_rev base HEAD ' @@ -357,7 +357,7 @@ test_expect_success '--continue asks for help after resolving patch to nil' ' test_cmp_rev unrelatedpick CHERRY_PICK_HEAD && git checkout HEAD -- unrelated && test_must_fail git cherry-pick --continue 2>msg && - test_i18ngrep "The previous cherry-pick is now empty" msg + grep "The previous cherry-pick is now empty" msg ' test_expect_success 'follow advice and skip nil patch' ' diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 5f9913ba33..5a28cfe7de 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -414,7 +414,7 @@ test_expect_success 'rm issues a warning when section is not found in .gitmodule git add .gitmodules && echo "warning: Could not find section in .gitmodules where path=submod" >expect.err && git rm submod >actual 2>actual.err && - test_i18ncmp expect.err actual.err && + test_cmp expect.err actual.err && ! test -d submod && ! test -f submod/.git && git status -s -uno >actual && @@ -592,7 +592,7 @@ test_expect_success 'rm of a populated submodule with a .git directory migrates ! test -d submod/.git && git status -s -uno --ignore-submodules=none >actual && test -s actual && - test_i18ngrep Migrating output.err + grep Migrating output.err ' cat >expect.deepmodified <actual && test -s actual && - test_i18ngrep Migrating output.err + grep Migrating output.err ' test_expect_success 'checking out a commit after submodule removal needs manual updates' ' @@ -688,7 +688,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git submodule update && git checkout -q HEAD^ && git checkout -q master 2>actual && - test_i18ngrep "^warning: unable to rmdir submod:" actual && + grep "^warning: unable to rmdir submod:" actual && git status -s submod >actual && echo "?? submod/" >expected && test_cmp expected actual && @@ -779,7 +779,7 @@ test_expect_success 'rm files with different staged content' ' echo content1 >foo.txt && echo content1 >bar.txt && test_must_fail git rm foo.txt bar.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm files with different staged content without hints' ' @@ -792,7 +792,7 @@ test_expect_success 'rm files with different staged content without hints' ' echo content2 >foo.txt && echo content2 >bar.txt && test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm file with local modification' ' @@ -804,7 +804,7 @@ test_expect_success 'rm file with local modification' ' git commit -m "testing rm 3" && echo content3 >foo.txt && test_must_fail git rm foo.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm file with local modification without hints' ' @@ -814,7 +814,7 @@ test_expect_success 'rm file with local modification without hints' ' EOF echo content4 >bar.txt && test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm file with changes in the index' ' @@ -827,7 +827,7 @@ test_expect_success 'rm file with changes in the index' ' echo content5 >foo.txt && git add foo.txt && test_must_fail git rm foo.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm file with changes in the index without hints' ' @@ -836,7 +836,7 @@ test_expect_success 'rm file with changes in the index without hints' ' foo.txt EOF test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm files with two different errors' ' @@ -855,12 +855,12 @@ test_expect_success 'rm files with two different errors' ' echo content6 >bar1.txt && git add bar1.txt && test_must_fail git rm bar1.txt foo1.txt 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'rm empty string should invoke warning' ' git rm -rf "" 2>output && - test_i18ngrep "warning: empty strings" output + grep "warning: empty strings" output ' test_done diff --git a/t/t3700-add.sh b/t/t3700-add.sh index f3a4b4a913..22ef3d611f 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -310,7 +310,7 @@ test_expect_success 'git add --dry-run of non-existing file' " test_expect_success 'git add --dry-run of an existing file output' " echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect && - test_i18ncmp expect actual + test_cmp expect actual " cat >expect.err <<\EOF @@ -327,13 +327,13 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file' ' ' test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' ' - test_i18ncmp expect.out actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.out actual.out && + test_cmp expect.err actual.err ' test_expect_success 'git add empty string should invoke warning' ' git add "" 2>output && - test_i18ngrep "warning: empty strings" output + grep "warning: empty strings" output ' test_expect_success 'git add --chmod=[+-]x stages correctly' ' diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index 3b94283e35..4bf1dbe9c9 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -45,7 +45,7 @@ test_expect_success 'UTF-8 invalid characters refused' ' printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + grep "did not conform" "$HOME"/stderr ' test_expect_success 'UTF-8 overlong sequences rejected' ' @@ -55,7 +55,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' ' printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + grep "did not conform" "$HOME"/stderr ' test_expect_success 'UTF-8 non-characters refused' ' @@ -64,7 +64,7 @@ test_expect_success 'UTF-8 non-characters refused' ' printf "Commit message\n\nNon-character:\364\217\277\276\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + grep "did not conform" "$HOME"/stderr ' test_expect_success 'UTF-8 non-characters refused' ' @@ -73,7 +73,7 @@ test_expect_success 'UTF-8 non-characters refused' ' printf "Commit message\n\nNon-character:\357\267\220\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + grep "did not conform" "$HOME"/stderr ' for H in ISO8859-1 eucJP ISO-2022-JP diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh index f663d567c8..509084e1a7 100755 --- a/t/t3901-i18n-patch.sh +++ b/t/t3901-i18n-patch.sh @@ -295,7 +295,7 @@ test_expect_success 'am --no-utf8 (U/L)' ' # commit-tree will warn that the commit message does not contain valid UTF-8 # as mailinfo did not convert it - test_i18ngrep "did not conform" err && + grep "did not conform" err && check_encoding 2 ' diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index b71d1e659e..9db97c1cc1 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -486,7 +486,7 @@ test_expect_success 'stash show format defaults to --stat' ' 1 file changed, 1 insertion(+) EOF git stash show ${STASH_ID} >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'stash show - stashes on stack, stash-like argument' ' @@ -664,7 +664,7 @@ test_expect_success 'stash apply shows status same as git status (relative to cu git stash apply ) | sed -e 1d >actual && # drop "Saved..." - test_i18ncmp expect actual + test_cmp expect actual ' cat > expect << EOF diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 0d1fa45d25..d22c821a88 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -134,11 +134,11 @@ test_expect_success 'favour same basenames over different ones' ' git rm path1 && mkdir subdir && git mv another-path subdir/path1 && - git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"' + git status | grep "renamed: .*path1 -> subdir/path1"' test_expect_success 'favour same basenames even with minor differences' ' git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && - git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"' + git status | grep "renamed: .*path1 -> subdir/path1"' test_expect_success 'two files with same basename and same content' ' git reset --hard && @@ -148,7 +148,7 @@ test_expect_success 'two files with same basename and same content' ' git add dir && git commit -m 2 && git mv dir other-dir && - git status | test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" + git status | grep "renamed: .*dir/A/file -> other-dir/A/file" ' test_expect_success 'setup for many rename source candidates' ' @@ -185,9 +185,9 @@ test_expect_success 'rename pretty print with nothing in common' ' git mv a/b/c c/b/a && git commit -m "a/b/c -> c/b/a" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " a/b/c => c/b/a " output && + grep " a/b/c => c/b/a " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " a/b/c => c/b/a " output + grep " a/b/c => c/b/a " output ' test_expect_success 'rename pretty print with common prefix' ' @@ -195,9 +195,9 @@ test_expect_success 'rename pretty print with common prefix' ' git mv c/b/a c/d/e && git commit -m "c/b/a -> c/d/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " c/{b/a => d/e} " output && + grep " c/{b/a => d/e} " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " c/{b/a => d/e} " output + grep " c/{b/a => d/e} " output ' test_expect_success 'rename pretty print with common suffix' ' @@ -205,9 +205,9 @@ test_expect_success 'rename pretty print with common suffix' ' git mv c/d/e d/e && git commit -m "c/d/e -> d/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " {c/d => d}/e " output && + grep " {c/d => d}/e " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " {c/d => d}/e " output + grep " {c/d => d}/e " output ' test_expect_success 'rename pretty print with common prefix and suffix' ' @@ -215,9 +215,9 @@ test_expect_success 'rename pretty print with common prefix and suffix' ' git mv d/e d/f/e && git commit -m "d/e -> d/f/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " d/{ => f}/e " output && + grep " d/{ => f}/e " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " d/{ => f}/e " output + grep " d/{ => f}/e " output ' test_expect_success 'rename pretty print common prefix and suffix overlap' ' @@ -225,9 +225,9 @@ test_expect_success 'rename pretty print common prefix and suffix overlap' ' git mv d/f/e d/f/f/e && git commit -m "d/f/e d/f/f/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " d/f/{ => f}/e " output && + grep " d/f/{ => f}/e " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " d/f/{ => f}/e " output + grep " d/f/{ => f}/e " output ' test_done diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index 76f643b2c2..c4a8855d5a 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -36,24 +36,24 @@ test_expect_success 'prepare binary file' ' # test_chmod -x rezrov && # echo " 0 files changed" >expect && # git diff HEAD --stat >actual && -# test_i18ncmp expect actual +# test_cmp expect actual # ' # # test_expect_success '--shortstat output after text chmod' ' # git diff HEAD --shortstat >actual && -# test_i18ncmp expect actual +# test_cmp expect actual # ' # # test_expect_success '--stat output after binary chmod' ' # test_chmod +x binbin && # echo " 0 files changed" >expect && # git diff HEAD --stat >actual && -# test_i18ncmp expect actual +# test_cmp expect actual # ' # # test_expect_success '--shortstat output after binary chmod' ' # git diff HEAD --shortstat >actual && -# test_i18ncmp expect actual +# test_cmp expect actual # ' test_done diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 0a8af76aab..ca7ba52816 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -34,19 +34,19 @@ EOF test_expect_success 'apply --stat output for binary file change' ' git diff >diff && git apply --stat --summary current && - test_i18ncmp expected current + test_cmp expected current ' test_expect_success 'diff --shortstat output for binary file change' ' tail -n 1 expected >expect && git diff --shortstat >current && - test_i18ncmp expect current + test_cmp expect current ' test_expect_success 'diff --shortstat output for binary file change only' ' echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected && git diff --shortstat -- b >current && - test_i18ncmp expected current + test_cmp expected current ' test_expect_success 'apply --numstat notices binary file change' ' @@ -63,7 +63,7 @@ test_expect_success 'apply --numstat understands diff --binary format' ' # apply needs to be able to skip the binary material correctly # in order to report the line number of a corrupt patch. -test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' ' +test_expect_success 'apply detecting corrupt patch correctly' ' git diff >output && sed -e "s/-CIT/xCIT/" broken && test_must_fail git apply --stat --summary broken 2>detected && @@ -73,7 +73,7 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' ' test "$detected" = xCIT ' -test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' ' +test_expect_success 'apply detecting corrupt patch correctly' ' git diff --binary | sed -e "s/-CIT/xCIT/" >broken && test_must_fail git apply --stat --summary broken 2>detected && detected=$(cat detected) && diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index d09acfe48e..695a4d03b2 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -132,7 +132,7 @@ do then case $cmd in *format-patch* | *-stat*) - test_i18ncmp "$expect" "$actual";; + test_cmp "$expect" "$actual";; *) test_cmp "$expect" "$actual";; esac && diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 482112ca33..fc69eed35a 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -735,11 +735,11 @@ echo "fatal: --check does not make sense" > expect.check test_expect_success 'options no longer allowed for format-patch' ' test_must_fail git format-patch --name-only 2> output && - test_i18ncmp expect.name-only output && + test_cmp expect.name-only output && test_must_fail git format-patch --name-status 2> output && - test_i18ncmp expect.name-status output && + test_cmp expect.name-status output && test_must_fail git format-patch --check 2> output && - test_i18ncmp expect.check output' + test_cmp expect.check output' test_expect_success 'format-patch --numstat should produce a patch' ' git format-patch --numstat --stdout master..side > output && diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh index 9c48e5c2c9..876271d682 100755 --- a/t/t4016-diff-quote.sh +++ b/t/t4016-diff-quote.sh @@ -82,7 +82,7 @@ test_expect_success 'git diff --stat -M HEAD' ' 7 files changed, 0 insertions(+), 0 deletions(-) EOF git diff --stat -M HEAD >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_done diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 1795ffc3aa..d77f20be27 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -54,15 +54,15 @@ do echo "*.java diff=$p" >.gitattributes && test_expect_code 1 git diff --no-index \ A.java B.java 2>msg && - test_i18ngrep ! fatal msg && - test_i18ngrep ! error msg + ! grep fatal msg && + ! grep error msg ' test_expect_success "builtin $p wordRegex pattern compiles" ' echo "*.java diff=$p" >.gitattributes && test_expect_code 1 git diff --no-index --word-diff \ A.java B.java 2>msg && - test_i18ngrep ! fatal msg && - test_i18ngrep ! error msg + ! grep fatal msg && + ! grep error msg ' done @@ -70,7 +70,7 @@ test_expect_success 'last regexp must not be negated' ' echo "*.java diff=java" >.gitattributes && test_config diff.java.funcname "!static" && test_expect_code 128 git diff --no-index A.java B.java 2>msg && - test_i18ngrep ": Last expression must not be negated:" msg + grep ": Last expression must not be negated:" msg ' test_expect_success 'setup hunk header tests' ' diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index aad6c7f78d..87632e9c16 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -139,7 +139,7 @@ EOF test_expect_success 'diffstat does not run textconv' ' echo file diff=fail >.gitattributes && git diff --stat HEAD^ HEAD >actual && - test_i18ncmp expect.stat actual && + test_cmp expect.stat actual && head -n1 expect.line1 && head -n1 actual.line1 && diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh index eacc6694f7..8c37856aa0 100755 --- a/t/t4031-diff-rewrite-binary.sh +++ b/t/t4031-diff-rewrite-binary.sh @@ -53,7 +53,7 @@ test_expect_success 'rewrite diff --numstat shows binary changes' ' test_expect_success 'diff --stat counts binary rewrite as 0 lines' ' git diff -B --stat --summary >diff && grep "Bin" diff && - test_i18ngrep "0 insertions.*0 deletions" diff && + grep "0 insertions.*0 deletions" diff && grep " rewrite file" diff ' diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 3950f5034d..56814e1ebd 100755 --- a/t/t4045-diff-relative.sh +++ b/t/t4045-diff-relative.sh @@ -49,7 +49,7 @@ cat >expected <actual && - test_i18ncmp expected actual + test_cmp expected actual " } diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh index 447a8ffa3a..7bb994fb95 100755 --- a/t/t4047-diff-dirstat.sh +++ b/t/t4047-diff-dirstat.sh @@ -941,37 +941,37 @@ test_expect_success '--dirstat=future_param,lines,0 should fail loudly' ' test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp /dev/null actual_diff_dirstat && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "\--dirstat" actual_error + grep -q "future_param" actual_error && + grep -q "\--dirstat" actual_error ' test_expect_success '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters' ' test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp /dev/null actual_diff_dirstat && - test_i18ngrep -q "dummy1" actual_error && - test_i18ngrep -q "2dummy" actual_error && - test_i18ngrep -q "\--dirstat" actual_error + grep -q "dummy1" actual_error && + grep -q "2dummy" actual_error && + grep -q "\--dirstat" actual_error ' test_expect_success 'diff.dirstat=future_param,0,lines should warn, but still work' ' git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat actual_diff_dirstat && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "diff\\.dirstat" actual_error && + grep -q "future_param" actual_error && + grep -q "diff\\.dirstat" actual_error && git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat_M actual_diff_dirstat_M && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "diff\\.dirstat" actual_error && + grep -q "future_param" actual_error && + grep -q "diff\\.dirstat" actual_error && git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "diff\\.dirstat" actual_error + grep -q "future_param" actual_error && + grep -q "diff\\.dirstat" actual_error ' test_expect_success '--shortstat --dirstat should output only one dirstat' ' diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh index a34121740a..53061b104e 100755 --- a/t/t4049-diff-stat-count.sh +++ b/t/t4049-diff-stat-count.sh @@ -25,7 +25,7 @@ test_expect_success 'mode-only change show as a 0-line change' ' 4 files changed, 2 insertions(+) EOF git diff --stat --stat-count=2 HEAD >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'binary changes do not count in lines' ' @@ -40,7 +40,7 @@ test_expect_success 'binary changes do not count in lines' ' 3 files changed, 2 insertions(+) EOF git diff --stat --stat-count=2 >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'exclude unmerged entries from total file count' ' @@ -62,7 +62,7 @@ test_expect_success 'exclude unmerged entries from total file count' ' 3 files changed, 3 insertions(+) EOF git diff --stat --stat-count=2 >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_done diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh index 741e0803c1..a12b7603d5 100755 --- a/t/t4055-diff-context.sh +++ b/t/t4055-diff-context.sh @@ -73,13 +73,13 @@ test_expect_success 'plumbing not affected' ' test_expect_success 'non-integer config parsing' ' git config diff.context no && test_must_fail git diff 2>output && - test_i18ngrep "bad numeric config value" output + grep "bad numeric config value" output ' test_expect_success 'negative integer config parsing' ' git config diff.context -1 && test_must_fail git diff 2>output && - test_i18ngrep "bad config variable" output + grep "bad config variable" output ' test_expect_success '-U0 is valid, so is diff.context=0' ' diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh index 744b8e51be..9b433de836 100755 --- a/t/t4100-apply-stat.sh +++ b/t/t4100-apply-stat.sh @@ -17,13 +17,13 @@ do test_expect_success "$title" ' git apply --stat --summary \ <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current && - test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current + test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current ' test_expect_success "$title with recount" ' sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" | git apply --recount --stat --summary >current && - test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current + test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current ' done <<\EOF rename diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index 497b62868d..5cff696198 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -31,7 +31,7 @@ test_expect_success 'apply git diff with -p2' ' test_expect_success 'apply with too large -p' ' cp file1.saved file1 && test_must_fail git apply --stat -p3 patch.file 2>err && - test_i18ngrep "removing 3 leading" err + grep "removing 3 leading" err ' test_expect_success 'apply (-p2) traditional diff with funny filenames' ' @@ -53,7 +53,7 @@ test_expect_success 'apply (-p2) traditional diff with funny filenames' ' test_expect_success 'apply with too large -p and fancy filename' ' cp file1.saved file1 && test_must_fail git apply --stat -p3 patch.escaped 2>err && - test_i18ngrep "removing 3 leading" err + grep "removing 3 leading" err ' test_expect_success 'apply (-p2) diff, mode change only' ' diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh index 4acb3f336e..f1e45ffa1e 100755 --- a/t/t4122-apply-symlink-inside.sh +++ b/t/t4122-apply-symlink-inside.sh @@ -91,19 +91,19 @@ test_expect_success SYMLINKS 'do not follow symbolic link (same input)' ' # same input creates a confusing symbolic link test_must_fail git apply patch 2>error-wt && - test_i18ngrep "beyond a symbolic link" error-wt && + grep "beyond a symbolic link" error-wt && test_path_is_missing arch/x86_64/dir && test_path_is_missing arch/i386/dir/file && test_must_fail git apply --index patch 2>error-ix && - test_i18ngrep "beyond a symbolic link" error-ix && + grep "beyond a symbolic link" error-ix && test_path_is_missing arch/x86_64/dir && test_path_is_missing arch/i386/dir/file && test_must_fail git ls-files --error-unmatch arch/x86_64/dir && test_must_fail git ls-files --error-unmatch arch/i386/dir && test_must_fail git apply --cached patch 2>error-ct && - test_i18ngrep "beyond a symbolic link" error-ct && + grep "beyond a symbolic link" error-ct && test_must_fail git ls-files --error-unmatch arch/x86_64/dir && test_must_fail git ls-files --error-unmatch arch/i386/dir && @@ -131,23 +131,23 @@ test_expect_success SYMLINKS 'do not follow symbolic link (existing)' ' git add arch/x86_64/dir && test_must_fail git apply add_file.patch 2>error-wt-add && - test_i18ngrep "beyond a symbolic link" error-wt-add && + grep "beyond a symbolic link" error-wt-add && test_path_is_missing arch/i386/dir/file && mkdir arch/i386/dir && >arch/i386/dir/file && test_must_fail git apply del_file.patch 2>error-wt-del && - test_i18ngrep "beyond a symbolic link" error-wt-del && + grep "beyond a symbolic link" error-wt-del && test_path_is_file arch/i386/dir/file && rm arch/i386/dir/file && test_must_fail git apply --index add_file.patch 2>error-ix-add && - test_i18ngrep "beyond a symbolic link" error-ix-add && + grep "beyond a symbolic link" error-ix-add && test_path_is_missing arch/i386/dir/file && test_must_fail git ls-files --error-unmatch arch/i386/dir && test_must_fail git apply --cached add_file.patch 2>error-ct-file && - test_i18ngrep "beyond a symbolic link" error-ct-file && + grep "beyond a symbolic link" error-ct-file && test_must_fail git ls-files --error-unmatch arch/i386/dir ' diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh index 2ecb4216b7..94da99075c 100755 --- a/t/t4133-apply-filenames.sh +++ b/t/t4133-apply-filenames.sh @@ -30,9 +30,9 @@ EOF test_expect_success 'apply diff with inconsistent filenames in headers' ' test_must_fail git apply bad1.patch 2>err && - test_i18ngrep "inconsistent new filename" err && + grep "inconsistent new filename" err && test_must_fail git apply bad2.patch 2>err && - test_i18ngrep "inconsistent old filename" err + grep "inconsistent old filename" err ' test_done diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 44807e218d..2bd9015f02 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -683,7 +683,7 @@ test_expect_success 'am --resolved fails if index has unmerged entries' ' test_must_fail git am --resolved >err && test_path_is_dir .git/rebase-apply && test_cmp_rev second HEAD && - test_i18ngrep "still have unmerged paths" err + grep "still have unmerged paths" err ' test_expect_success 'am takes patches from a Pine mailbox' ' @@ -817,7 +817,7 @@ test_expect_success 'am newline in subject' ' test_tick && sed -e "s/second/second \\\n foo/" patch1 >patchnl && git am output.out 2>&1 && - test_i18ngrep "^Applying: second \\\n foo$" output.out + grep "^Applying: second \\\n foo$" output.out ' test_expect_success 'am -q is quiet' ' @@ -836,7 +836,7 @@ test_expect_success 'am empty-file does not infloop' ' test_tick && test_must_fail git am empty-file 2>actual && echo Patch format detection failed. >expected && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'am --message-id really adds the message id' ' diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 9473c2779e..abc4ede219 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -46,9 +46,9 @@ do test_expect_success "am$with3 --skip continue after failed am$with3" ' test_must_fail git am$with3 --skip >output && - test_i18ngrep "^Applying" output >output.applying && - test_i18ngrep "^Applying: 6$" output.applying && - test_i18ncmp file-2-expect file-2 && + grep "^Applying" output >output.applying && + grep "^Applying: 6$" output.applying && + test_cmp file-2-expect file-2 && test ! -f .git/MERGE_RR ' diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh index 8ea22d1bcb..8268cc3b50 100755 --- a/t/t4153-am-resume-override-opts.sh +++ b/t/t4153-am-resume-override-opts.sh @@ -53,7 +53,7 @@ test_expect_success '--no-quiet overrides --quiet' ' # Applying side1 will be quiet. test_must_fail git am --quiet side[123].eml >out && test_path_is_dir .git/rebase-apply && - test_i18ngrep ! "^Applying: " out && + ! grep "^Applying: " out && echo side1 >file && git add file && @@ -61,7 +61,7 @@ test_expect_success '--no-quiet overrides --quiet' ' # Applying side2 will be quiet. git am --no-quiet --continue >out && echo "Applying: side1" >expected && - test_i18ncmp expected out + test_cmp expected out ' test_expect_success '--signoff overrides --no-signoff' ' diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 1a080e7823..8bbb8f3017 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -397,13 +397,13 @@ test_expect_success 'rerere --no-no-rerere-autoupdate' ' git update-index --index-info err && - test_i18ngrep [Uu]sage err && + grep [Uu]sage err && test_must_fail git update-index --refresh ' test_expect_success 'rerere -h' ' test_must_fail git rerere -h >help && - test_i18ngrep [Uu]sage help + grep [Uu]sage help ' concat_insert () { diff --git a/t/t4202-log.sh b/t/t4202-log.sh index f577990716..3c8a06a6d3 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -940,7 +940,7 @@ sanitize_output () { test_expect_success 'log --graph with diff and stats' ' git log --no-renames --graph --pretty=short --stat -p >actual && sanitize_output >actual.sanitized expect <<\EOF @@ -1217,7 +1217,7 @@ EOF test_expect_success 'log --line-prefix="*** " --graph with diff and stats' ' git log --line-prefix="*** " --no-renames --graph --pretty=short --stat -p >actual && sanitize_output >actual.sanitized expect <<-\EOF @@ -1340,15 +1340,15 @@ test_expect_success 'log --graph --no-walk is forbidden' ' test_expect_success 'log diagnoses bogus HEAD' ' git init empty && test_must_fail git -C empty log 2>stderr && - test_i18ngrep does.not.have.any.commits stderr && + grep does.not.have.any.commits stderr && echo 1234abcd >empty/.git/refs/heads/master && test_must_fail git -C empty log 2>stderr && - test_i18ngrep broken stderr && + grep broken stderr && echo "ref: refs/heads/invalid.lock" >empty/.git/HEAD && test_must_fail git -C empty log 2>stderr && - test_i18ngrep broken stderr && + grep broken stderr && test_must_fail git -C empty log --default totally-bogus 2>stderr && - test_i18ngrep broken stderr + grep broken stderr ' test_expect_success 'set up --source tests' ' diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 21eb8c8587..a9c771a6be 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -123,7 +123,7 @@ test_expect_success 'NUL separation with --stat' ' stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) && printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected && git log -z --stat --pretty="format:%s" >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_failure 'NUL termination with --stat' ' @@ -131,7 +131,7 @@ test_expect_failure 'NUL termination with --stat' ' stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) && printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected && git log -z --stat --pretty="tformat:%s" >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'setup more commits' ' diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh index 001343e2fc..d8f23f488e 100755 --- a/t/t4208-log-magic-pathspec.sh +++ b/t/t4208-log-magic-pathspec.sh @@ -18,7 +18,7 @@ test_expect_success '"git log :/" should not be ambiguous' ' test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' ' : >a && test_must_fail git log :/a 2>error && - test_i18ngrep ambiguous error + grep ambiguous error ' test_expect_success '"git log :/a -- " should not be ambiguous' ' @@ -31,7 +31,7 @@ test_expect_success '"git log -- :/a" should not be ambiguous' ' test_expect_success '"git log :" should be ambiguous' ' test_must_fail git log : 2>error && - test_i18ngrep ambiguous error + grep ambiguous error ' test_expect_success 'git log -- :' ' diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh index 22aa8b7c0e..c6065863af 100755 --- a/t/t4212-log-corrupt.sh +++ b/t/t4212-log-corrupt.sh @@ -15,7 +15,7 @@ test_expect_success 'setup' ' test_expect_success 'fsck notices broken commit' ' test_must_fail git fsck 2>actual && - test_i18ngrep invalid.author actual + grep invalid.author actual ' test_expect_success 'git log with broken author email' ' diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index 168739c721..9bd7dd2ba1 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -31,7 +31,7 @@ test_expect_success 'try to apply corrupted patch' ' test_expect_success 'compare diagnostic; ensure file is still here' ' echo "error: git diff header lacks filename information (line 4)" >expected && test_path_is_file f && - test_i18ncmp expected actual + test_cmp expected actual ' test_done diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index 82c33b88e7..85415b30ff 100755 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -216,14 +216,14 @@ test_expect_success 'pull request format' ' git request-pull initial "$downstream_url" tags/full >../request ) && request.fuzzy && - test_i18ncmp expect request.fuzzy && + test_cmp expect request.fuzzy && ( cd local && git request-pull initial "$downstream_url" tags/full:refs/tags/full ) >request && sed -nf fuzz.sed request.fuzzy && - test_i18ncmp expect request.fuzzy && + test_cmp expect request.fuzzy && ( cd local && diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 43a672c345..9d762eb5b0 100755 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@ -437,11 +437,11 @@ test_expect_success \ test_expect_success \ 'make sure index-pack detects the SHA1 collision' \ 'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg && - test_i18ngrep "SHA1 COLLISION FOUND" msg' + grep "SHA1 COLLISION FOUND" msg' test_expect_success \ 'make sure index-pack detects the SHA1 collision (large blobs)' \ 'test_must_fail git -c core.bigfilethreshold=1 index-pack -o bad.idx test-3.pack 2>msg && - test_i18ngrep "SHA1 COLLISION FOUND" msg' + grep "SHA1 COLLISION FOUND" msg' test_done diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 424bec7d77..699a4d1cdb 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -121,7 +121,7 @@ test_expect_success 'fetch (partial bitmap)' ' test_expect_success 'incremental repack fails when bitmaps are requested' ' test_commit more-1 && test_must_fail git repack -d 2>err && - test_i18ngrep "Incremental repacks are incompatible with bitmap" err + grep "Incremental repacks are incompatible with bitmap" err ' test_expect_success 'incremental repack can disable bitmaps' ' diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index b5865b385d..505e1b4a7f 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -484,7 +484,7 @@ test_expect_success 'test lonely missing ref' ' cd client && test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy ) >/dev/null 2>error-m && - test_i18ncmp expect-error error-m + test_cmp expect-error error-m ' test_expect_success 'test missing ref after existing' ' @@ -492,7 +492,7 @@ test_expect_success 'test missing ref after existing' ' cd client && test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy ) >/dev/null 2>error-em && - test_i18ncmp expect-error error-em + test_cmp expect-error error-em ' test_expect_success 'test missing ref before existing' ' @@ -500,7 +500,7 @@ test_expect_success 'test missing ref before existing' ' cd client && test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A ) >/dev/null 2>error-me && - test_i18ncmp expect-error error-me + test_cmp expect-error error-me ' test_expect_success 'test --all, --depth, and explicit head' ' diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index a6c0178f3a..10106c6e03 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -56,7 +56,7 @@ test_expect_success 'add remote whose URL agrees with url.<...>.insteadOf' ' git remote add myremote git@host.com:team/repo.git ' -test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' ' +test_expect_success 'remote information for the origin' ' ( cd test && tokens_match origin "$(git remote)" && @@ -79,7 +79,7 @@ test_expect_success 'add another remote' ' ) ' -test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' ' +test_expect_success 'check remote-tracking' ' ( cd test && check_remote_track origin master side && @@ -105,7 +105,7 @@ test_expect_success 'remove remote' ' ) ' -test_expect_success C_LOCALE_OUTPUT 'remove remote' ' +test_expect_success 'remove remote' ' ( cd test && tokens_match origin "$(git remote)" && @@ -139,8 +139,8 @@ test_expect_success 'remove remote protects local branches' ' git remote rm oops 2>actual2 && git branch -d foobranch && git tag -d footag && - test_i18ncmp expect1 actual1 && - test_i18ncmp expect2 actual2 + test_cmp expect1 actual1 && + test_cmp expect2 actual2 ) ' @@ -149,7 +149,7 @@ test_expect_success 'remove errors out early when deleting non-existent branch' cd test && echo "fatal: No such remote: foo" >expect && test_must_fail git remote rm foo 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ) ' @@ -177,7 +177,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch' cd test && echo "fatal: No such remote: foo" >expect && test_must_fail git remote rename foo bar 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ) ' @@ -185,7 +185,7 @@ test_expect_success 'add existing foreign_vcs remote' ' test_config remote.foo.vcs bar && echo "fatal: remote foo already exists." >expect && test_must_fail git remote add foo bar 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'add existing foreign_vcs remote' ' @@ -193,7 +193,7 @@ test_expect_success 'add existing foreign_vcs remote' ' test_config remote.bar.vcs bar && echo "fatal: remote bar already exists." >expect && test_must_fail git remote rename foo bar 2>actual && - test_i18ncmp expect actual + test_cmp expect actual ' cat >test/expect <output && git branch -d rebase octopus && - test_i18ncmp expect output + test_cmp expect output ) ' @@ -280,7 +280,7 @@ test_expect_success 'show -n' ' cd test && git remote show -n origin >output && mv ../one.unreachable ../one && - test_i18ncmp expect output + test_cmp expect output ) ' @@ -323,7 +323,7 @@ test_expect_success 'set-head --auto has no problem w/multiple HEADs' ' git fetch two "refs/heads/*:refs/remotes/two/*" && git remote set-head --auto two >output 2>&1 && echo "two/HEAD set to master" >expect && - test_i18ncmp expect output + test_cmp expect output ) ' @@ -359,7 +359,7 @@ test_expect_success 'prune --dry-run' ' ( cd ../one && git branch -m side side2) && - test_i18ncmp expect output + test_cmp expect output ) ' @@ -864,7 +864,7 @@ test_expect_success 'remote prune to cause a dangling symref' ' cd eight && git remote prune origin ) >err 2>&1 && - test_i18ngrep "has become dangling" err && + grep "has become dangling" err && : And the dangling symref will not cause other annoying errors && ( @@ -1208,7 +1208,7 @@ test_expect_success 'extra args: setup' ' test_extra_arg () { test_expect_success "extra args: $*" " test_must_fail git remote $* bogus_extra_arg 2>actual && - test_i18ngrep '^usage:' actual + grep '^usage:' actual " } diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 668c54be41..ed760d7886 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -223,11 +223,11 @@ test_expect_success 'fetch uses remote ref names to describe new refs' ' cd descriptive && git fetch o 2>actual && grep " -> refs/crazyheads/descriptive-branch$" actual | - test_i18ngrep "new branch" && + grep "new branch" && grep " -> descriptive-tag$" actual | - test_i18ngrep "new tag" && + grep "new tag" && grep " -> crazy$" actual | - test_i18ngrep "new ref" + grep "new ref" ) && git checkout master ' @@ -644,7 +644,7 @@ test_expect_success 'fetch --prune prints the remotes url' ' git fetch --prune origin 2>&1 | head -n1 >../actual ) && echo "From ${D}/." >expect && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'branchname D/F conflict resolved by --prune' ' @@ -688,7 +688,7 @@ test_expect_success 'fetching with auto-gc does not lock up' ' ) ' -test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' +test_expect_success 'fetch aligned output' ' git clone . full-output && test_commit looooooooooooong-tag && ( @@ -703,7 +703,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' test_cmp expect actual ' -test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' +test_expect_success 'fetch compact output' ' git clone . compact && test_commit extraaa && ( diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh index 94fc9be9ce..c78ba425e4 100755 --- a/t/t5512-ls-remote.sh +++ b/t/t5512-ls-remote.sh @@ -99,7 +99,7 @@ test_expect_success 'confuses pattern as remote when no remote specified' ' # We could just as easily have used "master"; the "*" emphasizes its # role as a pattern. test_must_fail git ls-remote refs*master >actual 2>&1 && - test_i18ncmp exp actual + test_cmp exp actual ' test_expect_success 'die with non-2 for wrong repository even with --exit-code' ' diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 177897ea0b..6b729ca938 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1099,7 +1099,7 @@ test_expect_success 'fetch exact SHA1' ' # fetching the hidden object should fail by default test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err && - test_i18ngrep "Server does not allow request for unadvertised object" err && + grep "Server does not allow request for unadvertised object" err && test_must_fail git rev-parse --verify refs/heads/copy && # the server side can allow it to succeed diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 17f4d0fe4e..dc2c990f82 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -24,7 +24,7 @@ test_pull_autostash_fail () { echo dirty >new_file && git add new_file && test_must_fail git pull "$@" . copy 2>err && - test_i18ngrep "uncommitted changes." err + grep "uncommitted changes." err } test_expect_success setup ' @@ -139,7 +139,7 @@ test_expect_success 'fail if wildcard spec does not match any refs' ' test_when_finished "git checkout -f copy && git branch -D test" && test "$(cat file)" = file && test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err && - test_i18ngrep "no candidates for merging" err && + grep "no candidates for merging" err && test "$(cat file)" = file ' @@ -151,7 +151,7 @@ test_expect_success 'fail if no branches specified with non-default remote' ' test "$(cat file)" = file && test_config branch.test.remote origin && test_must_fail git pull test_remote 2>err && - test_i18ngrep "specify a branch on the command line" err && + grep "specify a branch on the command line" err && test "$(cat file)" = file ' @@ -162,7 +162,7 @@ test_expect_success 'fail if not on a branch' ' test_when_finished "git checkout -f copy" && test "$(cat file)" = file && test_must_fail git pull 2>err && - test_i18ngrep "not currently on a branch" err && + grep "not currently on a branch" err && test "$(cat file)" = file ' @@ -174,7 +174,7 @@ test_expect_success 'fail if no configuration for current branch' ' test_config branch.test.remote test_remote && test "$(cat file)" = file && test_must_fail git pull 2>err && - test_i18ngrep "no tracking information" err && + grep "no tracking information" err && test "$(cat file)" = file ' @@ -186,7 +186,7 @@ test_expect_success 'pull --all: fail if no configuration for current branch' ' test_config branch.test.remote test_remote && test "$(cat file)" = file && test_must_fail git pull --all 2>err && - test_i18ngrep "There is no tracking information" err && + grep "There is no tracking information" err && test "$(cat file)" = file ' @@ -197,7 +197,7 @@ test_expect_success 'fail if upstream branch does not exist' ' test_config branch.test.merge refs/heads/nonexisting && test "$(cat file)" = file && test_must_fail git pull 2>err && - test_i18ngrep "no such ref was fetched" err && + grep "no such ref was fetched" err && test "$(cat file)" = file ' @@ -211,12 +211,12 @@ test_expect_success 'fail if the index has unresolved entries' ' test -n "$(git ls-files -u)" && cp file expected && test_must_fail git pull . second 2>err && - test_i18ngrep "Pulling is not possible because you have unmerged files." err && + grep "Pulling is not possible because you have unmerged files." err && test_cmp expected file && git add file && test -z "$(git ls-files -u)" && test_must_fail git pull . second 2>err && - test_i18ngrep "You have not concluded your merge" err && + grep "You have not concluded your merge" err && test_cmp expected file ' @@ -225,7 +225,7 @@ test_expect_success 'fast-forwards working tree if branch head is updated' ' test_when_finished "git checkout -f copy && git branch -D third" && test "$(cat file)" = file && git pull . second:third 2>err && - test_i18ngrep "fetch updated the current branch head" err && + grep "fetch updated the current branch head" err && test "$(cat file)" = modified && test "$(git rev-parse third)" = "$(git rev-parse second)" ' @@ -236,7 +236,7 @@ test_expect_success 'fast-forward fails with conflicting work tree' ' test "$(cat file)" = file && echo conflict >file && test_must_fail git pull . second:third 2>err && - test_i18ngrep "Cannot fast-forward your working tree" err && + grep "Cannot fast-forward your working tree" err && test "$(cat file)" = conflict && test "$(git rev-parse third)" = "$(git rev-parse second)" ' @@ -287,7 +287,7 @@ test_expect_success '--rebase with conflicts shows advice' ' test_tick && git commit -m "Create conflict" seq.txt && test_must_fail git pull --rebase . seq 2>err >out && - test_i18ngrep "When you have resolved this problem" out + grep "When you have resolved this problem" out ' test_expect_success 'failed --rebase shows advice' ' @@ -301,14 +301,14 @@ test_expect_success 'failed --rebase shows advice' ' git checkout -f -b fails-to-rebase HEAD^ && test_commit v2-without-cr file "2" file2-lf && test_must_fail git pull --rebase . diverging 2>err >out && - test_i18ngrep "When you have resolved this problem" out + grep "When you have resolved this problem" out ' test_expect_success '--rebase fails with multiple branches' ' git reset --hard before-rebase && test_must_fail git pull --rebase . copy master 2>err && test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" && - test_i18ngrep "Cannot rebase onto multiple branches" err && + grep "Cannot rebase onto multiple branches" err && test modified = "$(git show HEAD:file)" ' @@ -351,7 +351,7 @@ for i in --autostash --no-autostash do test_expect_success "pull $i (without --rebase) is illegal" ' test_must_fail git pull $i . copy 2>err && - test_i18ngrep "only valid with --rebase" err + grep "only valid with --rebase" err ' done @@ -395,7 +395,7 @@ test_expect_success "pull --rebase warns on --verify-signatures" ' git pull --rebase --verify-signatures . copy 2>err && test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && test new = "$(git show HEAD:file2)" && - test_i18ngrep "ignoring --verify-signatures for rebase" err + grep "ignoring --verify-signatures for rebase" err ' test_expect_success "pull --rebase does not warn on --no-verify-signatures" ' @@ -403,7 +403,7 @@ test_expect_success "pull --rebase does not warn on --no-verify-signatures" ' git pull --rebase --no-verify-signatures . copy 2>err && test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && test new = "$(git show HEAD:file2)" && - test_i18ngrep ! "verify-signatures" err + ! grep "verify-signatures" err ' # add a feature branch, keep-merge, that is merged into master, so the @@ -596,7 +596,7 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' ' test_must_fail git pull --rebase .. master 2>err && test "$(git ls-files)" = staged-file && test "$(git show :staged-file)" = staged-file && - test_i18ngrep "unborn branch with changes added to the index" err + grep "unborn branch with changes added to the index" err ) ' diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index d6981ba304..3683df13a6 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -75,7 +75,7 @@ test_expect_success TTY 'progress messages go to tty' ' ensure_fresh_upstream && test_terminal git push -u upstream master >out 2>err && - test_i18ngrep "Writing objects" err + grep "Writing objects" err ' test_expect_success 'progress messages do not go to non-tty' ' @@ -83,7 +83,7 @@ test_expect_success 'progress messages do not go to non-tty' ' # skip progress messages, since stderr is non-tty git push -u upstream master >out 2>err && - test_i18ngrep ! "Writing objects" err + ! grep "Writing objects" err ' test_expect_success 'progress messages go to non-tty (forced)' ' @@ -91,22 +91,22 @@ test_expect_success 'progress messages go to non-tty (forced)' ' # force progress messages to stderr, even though it is non-tty git push -u --progress upstream master >out 2>err && - test_i18ngrep "Writing objects" err + grep "Writing objects" err ' test_expect_success TTY 'push -q suppresses progress' ' ensure_fresh_upstream && test_terminal git push -u -q upstream master >out 2>err && - test_i18ngrep ! "Writing objects" err + ! grep "Writing objects" err ' test_expect_success TTY 'push --no-progress suppresses progress' ' ensure_fresh_upstream && test_terminal git push -u --no-progress upstream master >out 2>err && - test_i18ngrep ! "Unpacking objects" err && - test_i18ngrep ! "Writing objects" err + ! grep "Unpacking objects" err && + ! grep "Writing objects" err ' test_expect_success TTY 'quiet push' ' diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index f3b0a8d30a..0418f35bdd 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -68,7 +68,7 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" ' git fetch --recurse-submodules >../actual.out 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" ' @@ -78,7 +78,7 @@ test_expect_success "fetch --recurse-submodules -j2 has the same output behaviou GIT_TRACE=$(pwd)/../trace.out git fetch --recurse-submodules -j2 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err && + test_cmp expect.err actual.err && grep "2 tasks" trace.out ' @@ -108,7 +108,7 @@ test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses i git fetch >../actual.out 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "--no-recurse-submodules overrides .gitmodules config" ' @@ -139,7 +139,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti git config --unset submodule.submodule.fetchRecurseSubmodules ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "--quiet propagates to submodules" ' @@ -167,7 +167,7 @@ test_expect_success "--dry-run propagates to submodules" ' git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "Without --dry-run propagates to submodules" ' @@ -176,7 +176,7 @@ test_expect_success "Without --dry-run propagates to submodules" ' git fetch --recurse-submodules >../actual.out 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "recurseSubmodules=true propagates into submodules" ' @@ -187,7 +187,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" ' git fetch >../actual.out 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "--recurse-submodules overrides config in submodule" ' @@ -201,7 +201,7 @@ test_expect_success "--recurse-submodules overrides config in submodule" ' git fetch --recurse-submodules >../actual.out 2>../actual.err ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "--no-recurse-submodules overrides config setting" ' @@ -241,7 +241,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched" cd downstream && git fetch >../actual.out 2>../actual.err ) && - test_i18ncmp expect.err.sub actual.err && + test_cmp expect.err.sub actual.err && test_must_be_empty actual.out ' @@ -259,7 +259,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don' git fetch >../actual.out 2>../actual.err ) && ! test -s actual.out && - test_i18ncmp expect.err.file actual.err + test_cmp expect.err.file actual.err ' test_expect_success "Recursion picks up config in submodule" ' @@ -287,7 +287,7 @@ test_expect_success "Recursion picks up config in submodule" ' git config --unset fetch.recurseSubmodules ) ) && - test_i18ncmp expect.err.sub actual.err && + test_cmp expect.err.sub actual.err && test_must_be_empty actual.out ' @@ -320,7 +320,7 @@ test_expect_success "Recursion picks up all submodules when necessary" ' cd downstream && git fetch >../actual.out 2>../actual.err ) && - test_i18ncmp expect.err.2 actual.err && + test_cmp expect.err.2 actual.err && test_must_be_empty actual.out ' @@ -376,7 +376,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess ) ) && test_must_be_empty actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" ' @@ -393,7 +393,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err ) && ! test -s actual.out && - test_i18ncmp expect.err.file actual.err + test_cmp expect.err.file actual.err ' test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" ' @@ -421,7 +421,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config git config --unset fetch.recurseSubmodules ) && test_must_be_empty actual.out && - test_i18ncmp expect.err.2 actual.err + test_cmp expect.err.2 actual.err ' test_expect_success "'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" ' @@ -449,7 +449,7 @@ test_expect_success "'submodule..fetchRecurseSubmodules=on-demand' override git config --unset submodule.submodule.fetchRecurseSubmodules ) && test_must_be_empty actual.out && - test_i18ncmp expect.err.2 actual.err + test_cmp expect.err.2 actual.err ' test_expect_success "don't fetch submodule when newly recorded commits are already present" ' @@ -468,7 +468,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea git fetch >../actual.out 2>../actual.err ) && ! test -s actual.out && - test_i18ncmp expect.err actual.err + test_cmp expect.err actual.err ' test_expect_success 'fetching submodules respects parallel settings' ' diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index 4f6e32b04c..8e6042930e 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -35,8 +35,8 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' ' printf "0032want %s\n00000009done\n0000" \ $(git rev-parse HEAD) >input && test_must_fail git upload-pack . /dev/null 2>output.err && - test_i18ngrep "unable to read" output.err && - test_i18ngrep "pack-objects died" output.err + grep "unable to read" output.err && + grep "pack-objects died" output.err ' test_expect_success 'corrupt repo differently' ' diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh index ecb8d446a5..97dc6c3610 100755 --- a/t/t5534-push-signed.sh +++ b/t/t5534-push-signed.sh @@ -68,7 +68,7 @@ test_expect_success 'push --signed fails with a receiver without push certificat prepare_dst && mkdir -p dst/.git/hooks && test_must_fail git push --signed dst noop ff +noff 2>err && - test_i18ngrep "the receiving end does not support" err + grep "the receiving end does not support" err ' test_expect_success GPG 'no certificate for a signed push with no update' ' diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh index 2e42cf3316..6c5d3a4ce0 100755 --- a/t/t5536-fetch-conflicts.sh +++ b/t/t5536-fetch-conflicts.sh @@ -22,8 +22,8 @@ verify_stderr () { cat >expected && # We're not interested in the error # "fatal: The remote end hung up unexpectedly": - test_i18ngrep -E '^(fatal|warning):' actual | sort && - test_i18ncmp expected actual + grep -E '^(fatal|warning):' actual | sort && + test_cmp expected actual } test_expect_success 'setup' ' diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index d38bf32470..10a64cc205 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -119,7 +119,7 @@ test_expect_success 'rejected update prints status' ' git commit -m dev2 && test_must_fail git push origin dev2 2>act && sed -e "/^remote: /s/ *$//" cmp && - test_i18ncmp exp cmp + test_cmp exp cmp ' rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update" @@ -168,7 +168,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he ' test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' ' - test_i18ngrep "Updates were rejected because" \ + grep "Updates were rejected because" \ output ' @@ -219,7 +219,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' ' cd "$ROOT_PATH"/test_repo_clone && test_commit noisy && test_terminal git push >output 2>&1 && - test_i18ngrep "^Writing objects" output + grep "^Writing objects" output ' test_expect_success TTY 'push --quiet silences status and progress' ' @@ -233,16 +233,16 @@ test_expect_success TTY 'push --no-progress silences progress but not status' ' cd "$ROOT_PATH"/test_repo_clone && test_commit no-progress && test_terminal git push --no-progress >output 2>&1 && - test_i18ngrep "^To http" output && - test_i18ngrep ! "^Writing objects" + grep "^To http" output && + ! grep "^Writing objects" ' test_expect_success 'push --progress shows progress to non-tty' ' cd "$ROOT_PATH"/test_repo_clone && test_commit progress && git push --progress >output 2>&1 && - test_i18ngrep "^To http" output && - test_i18ngrep "^Writing objects" output + grep "^To http" output && + grep "^Writing objects" output ' test_expect_success 'http push gives sane defaults to reflog' ' diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh index f9232f5d0f..e20f976347 100755 --- a/t/t5545-push-options.sh +++ b/t/t5545-push-options.sh @@ -112,7 +112,7 @@ test_expect_success 'push option denied properly by http server' ' git clone "$HTTPD_URL"/smart/upstream test_http_clone && test_commit -C test_http_clone one && test_must_fail git -C test_http_clone push --push-option=asdf origin master 2>actual && - test_i18ngrep "the receiving end does not support push options" actual && + grep "the receiving end does not support push options" actual && git -C test_http_clone push origin master ' diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh index 87308cdced..214f34023e 100755 --- a/t/t5550-http-fetch-dumb.sh +++ b/t/t5550-http-fetch-dumb.sh @@ -325,7 +325,7 @@ test_expect_success 'redirects can be forbidden/allowed' ' test_expect_success 'redirects are reported to stderr' ' # just look for a snippet of the redirected-to URL - test_i18ngrep /dumb/ stderr + grep /dumb/ stderr ' test_expect_success 'non-initial redirects can be forbidden' ' @@ -393,7 +393,7 @@ test_expect_success 'can redirect through non-"info/refs?service=git-upload-pack test_expect_success 'print HTTP error when any intermediate redirect throws error' ' test_must_fail git clone "$HTTPD_URL/redir-to/502" 2> stderr && - test_i18ngrep "unable to access.*/redir-to/502" stderr + grep "unable to access.*/redir-to/502" stderr ' stop_httpd diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index 225a022e8a..1c59f6650a 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -139,7 +139,7 @@ test_remote_error() fi test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output && - test_i18ngrep "fatal: remote error: $msg: /$repo" output && + grep "fatal: remote error: $msg: /$repo" output && ret=$? chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" (exit $ret) diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 9c56f771b6..a72be3255e 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -37,7 +37,7 @@ test_expect_success 'clone with excess parameters (2)' ' ' -test_expect_success C_LOCALE_OUTPUT 'output from clone' ' +test_expect_success 'output from clone' ' rm -fr dst && git clone -n "file://$(pwd)/src" dst >output 2>&1 && test $(grep Clon output | wc -l) = 1 diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh index 9e24ec88e6..42406954eb 100755 --- a/t/t5606-clone-options.sh +++ b/t/t5606-clone-options.sh @@ -23,7 +23,7 @@ test_expect_success 'redirected clone does not show progress' ' git clone "file://$(pwd)/parent" clone-redirected >out 2>err && ! grep % err && - test_i18ngrep ! "Checking connectivity" err + ! grep "Checking connectivity" err ' diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh index d911afd24c..ec47a69f39 100755 --- a/t/t5812-proto-disable-http.sh +++ b/t/t5812-proto-disable-http.sh @@ -21,8 +21,8 @@ test_expect_success 'curl redirects respect whitelist' ' GIT_SMART_HTTP=0 \ git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr && { - test_i18ngrep "ftp.*disabled" stderr || - test_i18ngrep "your curl version is too old" + grep "ftp.*disabled" stderr || + grep "your curl version is too old" } ' diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 05ebba7afa..86967fd221 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -242,10 +242,10 @@ test_expect_success 'merge of identical changes in a renamed file' ' rm -f A M N && git reset --hard && git checkout change+rename && - GIT_MERGE_VERBOSITY=3 git merge change | test_i18ngrep "^Skipped B" && + GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" && git reset --hard HEAD^ && git checkout change && - GIT_MERGE_VERBOSITY=3 git merge change+rename | test_i18ngrep "^Skipped B" + GIT_MERGE_VERBOSITY=3 git merge change+rename | grep "^Skipped B" ' test_expect_success 'setup for rename + d/f conflicts' ' @@ -303,9 +303,9 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' ' git checkout -q renamed-file-has-no-conflicts^0 && test_must_fail git merge --strategy=recursive dir-in-way >output && - test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output && - test_i18ngrep "Auto-merging dir" output && - test_i18ngrep "Adding as dir~HEAD instead" output && + grep "CONFLICT (modify/delete): dir/file-in-the-way" output && + grep "Auto-merging dir" output && + grep "Adding as dir~HEAD instead" output && test 3 -eq "$(git ls-files -u | wc -l)" && test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" && @@ -325,9 +325,9 @@ test_expect_success 'Same as previous, but merged other way' ' test_must_fail git merge --strategy=recursive renamed-file-has-no-conflicts >output 2>errors && ! grep "error: refusing to lose untracked file at" errors && - test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output && - test_i18ngrep "Auto-merging dir" output && - test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output && + grep "CONFLICT (modify/delete): dir/file-in-the-way" output && + grep "Auto-merging dir" output && + grep "Adding as dir~renamed-file-has-no-conflicts instead" output && test 3 -eq "$(git ls-files -u | wc -l)" && test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" && diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 8c2c6eaef8..4f633722b8 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -157,7 +157,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if cp .git/BISECT_START saved && test_must_fail git bisect start $HASH4 foo -- && git branch > branch.output && - test_i18ngrep "* (no branch, bisect started on other)" branch.output > /dev/null && + grep "* (no branch, bisect started on other)" branch.output > /dev/null && test_cmp saved .git/BISECT_START ' test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' ' @@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' ' test_expect_success 'bisect errors out if bad and good are mistaken' ' git bisect reset && test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error && - test_i18ngrep "mistook good and bad" rev_list_error && + grep "mistook good and bad" rev_list_error && git bisect reset ' @@ -404,7 +404,7 @@ test_expect_success 'side branch creation' ' test_expect_success 'good merge base when good and bad are siblings' ' git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt && - test_i18ngrep "merge base must be tested" my_bisect_log.txt && + grep "merge base must be tested" my_bisect_log.txt && grep $HASH4 my_bisect_log.txt && git bisect good > my_bisect_log.txt && ! grep "merge base must be tested" my_bisect_log.txt && @@ -413,7 +413,7 @@ test_expect_success 'good merge base when good and bad are siblings' ' ' test_expect_success 'skipped merge base when good and bad are siblings' ' git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt && - test_i18ngrep "merge base must be tested" my_bisect_log.txt && + grep "merge base must be tested" my_bisect_log.txt && grep $HASH4 my_bisect_log.txt && git bisect skip > my_bisect_log.txt 2>&1 && grep "warning" my_bisect_log.txt && @@ -423,11 +423,11 @@ test_expect_success 'skipped merge base when good and bad are siblings' ' test_expect_success 'bad merge base when good and bad are siblings' ' git bisect start "$HASH7" HEAD > my_bisect_log.txt && - test_i18ngrep "merge base must be tested" my_bisect_log.txt && + grep "merge base must be tested" my_bisect_log.txt && grep $HASH4 my_bisect_log.txt && test_must_fail git bisect bad > my_bisect_log.txt 2>&1 && - test_i18ngrep "merge base $HASH4 is bad" my_bisect_log.txt && - test_i18ngrep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt && + grep "merge base $HASH4 is bad" my_bisect_log.txt && + grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt && git bisect reset ' @@ -460,9 +460,9 @@ test_expect_success 'many merge bases creation' ' test_expect_success 'good merge bases when good and bad are siblings' ' git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt && - test_i18ngrep "merge base must be tested" my_bisect_log.txt && + grep "merge base must be tested" my_bisect_log.txt && git bisect good > my_bisect_log2.txt && - test_i18ngrep "merge base must be tested" my_bisect_log2.txt && + grep "merge base must be tested" my_bisect_log2.txt && { { grep "$SIDE_HASH5" my_bisect_log.txt && @@ -477,14 +477,14 @@ test_expect_success 'good merge bases when good and bad are siblings' ' test_expect_success 'optimized merge base checks' ' git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt && - test_i18ngrep "merge base must be tested" my_bisect_log.txt && + grep "merge base must be tested" my_bisect_log.txt && grep "$HASH4" my_bisect_log.txt && git bisect good > my_bisect_log2.txt && test -f ".git/BISECT_ANCESTORS_OK" && test "$HASH6" = $(git rev-parse --verify HEAD) && git bisect bad > my_bisect_log3.txt && git bisect good "$A_HASH" > my_bisect_log4.txt && - test_i18ngrep "merge base must be tested" my_bisect_log4.txt && + grep "merge base must be tested" my_bisect_log4.txt && test_must_fail test -f ".git/BISECT_ANCESTORS_OK" ' @@ -562,7 +562,7 @@ test_expect_success 'skipping away from skipped commit' ' test_expect_success 'erroring out when using bad path parameters' ' test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt && - test_i18ngrep "bad path parameters" error.txt + grep "bad path parameters" error.txt ' test_expect_success 'test bisection on bare repo - --no-checkout specified' ' @@ -803,7 +803,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' ' test_must_fail git bisect terms 1 2 && test_must_fail git bisect terms 2>actual && echo "no terms defined" >expected && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'bisect terms shows good/bad after start' ' @@ -875,7 +875,7 @@ test_expect_success 'bisect start --term-* does store terms' ' Your current terms are two for the old state and one for the new state. EOF - test_i18ncmp expected actual && + test_cmp expected actual && git bisect terms --term-bad >actual && echo one >expected && test_cmp expected actual && diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 97a07655a0..66ed8365ea 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -54,7 +54,7 @@ test_expect_success 'branch -v' ' git branch -v ) | sed -n -e "$script" >actual && - test_i18ncmp expect actual + test_cmp expect actual ' cat >expect <<\EOF @@ -72,20 +72,20 @@ test_expect_success 'branch -vv' ' git branch -vv ) | sed -n -e "$script" >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'checkout (diverged from upstream)' ' ( cd test && git checkout b1 ) >actual && - test_i18ngrep "have 1 and 1 different" actual + grep "have 1 and 1 different" actual ' test_expect_success 'checkout with local tracked branch' ' git checkout master && git checkout follower >actual && - test_i18ngrep "is ahead of" actual + grep "is ahead of" actual ' test_expect_success 'checkout (upstream is gone)' ' @@ -93,14 +93,14 @@ test_expect_success 'checkout (upstream is gone)' ' cd test && git checkout b5 ) >actual && - test_i18ngrep "is based on .*, but the upstream is gone." actual + grep "is based on .*, but the upstream is gone." actual ' test_expect_success 'checkout (up-to-date with upstream)' ' ( cd test && git checkout b6 ) >actual && - test_i18ngrep "Your branch is up-to-date with .origin/master" actual + grep "Your branch is up-to-date with .origin/master" actual ' test_expect_success 'status (diverged from upstream)' ' @@ -110,7 +110,7 @@ test_expect_success 'status (diverged from upstream)' ' # reports nothing to commit test_must_fail git commit --dry-run ) >actual && - test_i18ngrep "have 1 and 1 different" actual + grep "have 1 and 1 different" actual ' test_expect_success 'status (upstream is gone)' ' @@ -120,7 +120,7 @@ test_expect_success 'status (upstream is gone)' ' # reports nothing to commit test_must_fail git commit --dry-run ) >actual && - test_i18ngrep "is based on .*, but the upstream is gone." actual + grep "is based on .*, but the upstream is gone." actual ' test_expect_success 'status (up-to-date with upstream)' ' @@ -130,7 +130,7 @@ test_expect_success 'status (up-to-date with upstream)' ' # reports nothing to commit test_must_fail git commit --dry-run ) >actual && - test_i18ngrep "Your branch is up-to-date with .origin/master" actual + grep "Your branch is up-to-date with .origin/master" actual ' cat >expect <<\EOF @@ -143,7 +143,7 @@ test_expect_success 'status -s -b (diverged from upstream)' ' git checkout b1 >/dev/null && git status -s -b | head -1 ) >actual && - test_i18ncmp expect actual + test_cmp expect actual ' cat >expect <<\EOF @@ -156,7 +156,7 @@ test_expect_success 'status -s -b (upstream is gone)' ' git checkout b5 >/dev/null && git status -s -b | head -1 ) >actual && - test_i18ncmp expect actual + test_cmp expect actual ' cat >expect <<\EOF @@ -169,14 +169,14 @@ test_expect_success 'status -s -b (up-to-date with upstream)' ' git checkout b6 >/dev/null && git status -s -b | head -1 ) >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'fail to track lightweight tags' ' git checkout master && git tag light && test_must_fail git branch --track lighttrack light >actual && - test_i18ngrep ! "set up to track" actual && + ! grep "set up to track" actual && test_must_fail git checkout lighttrack ' @@ -184,7 +184,7 @@ test_expect_success 'fail to track annotated tags' ' git checkout master && git tag -m heavy heavy && test_must_fail git branch --track heavytrack heavy >actual && - test_i18ngrep ! "set up to track" actual && + ! grep "set up to track" actual && test_must_fail git checkout heavytrack ' diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 411550d2b6..466fa3804b 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -380,7 +380,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' ' git checkout B^0 && test_must_fail git merge -s recursive C^0 >out && - test_i18ngrep "CONFLICT (rename/rename)" out && + grep "CONFLICT (rename/rename)" out && test 2 -eq $(git ls-files -s | wc -l) && test 2 -eq $(git ls-files -u | wc -l) && diff --git a/t/t6045-merge-rename-delete.sh b/t/t6045-merge-rename-delete.sh index 5d33577d2f..0f54e4f033 100755 --- a/t/t6045-merge-rename-delete.sh +++ b/t/t6045-merge-rename-delete.sh @@ -17,7 +17,7 @@ test_expect_success 'rename/delete' ' git commit -m "delete" && test_must_fail git merge --strategy=recursive rename >output && - test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output + grep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output ' test_done diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 16952e44fc..e36f6aba35 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -135,7 +135,7 @@ warning: tag 'A' is really 'Q' here EOF check_describe A-* HEAD test_expect_success 'warning was displayed for Q' ' - test_i18ncmp err.expect err.actual + test_cmp err.expect err.actual ' test_expect_success 'rename tag Q back to A' ' mv .git/refs/tags/Q .git/refs/tags/A diff --git a/t/t6135-pathspec-with-attrs.sh b/t/t6135-pathspec-with-attrs.sh index 77b8cef661..fdc034bcf2 100755 --- a/t/t6135-pathspec-with-attrs.sh +++ b/t/t6135-pathspec-with-attrs.sh @@ -156,7 +156,7 @@ test_expect_success 'check label excluding other labels' ' test_expect_success 'fail on multiple attr specifiers in one pathspec item' ' test_must_fail git ls-files . ":(attr:labelB,attr:labelC)" 2>actual && - test_i18ngrep "Only one" actual + grep "Only one" actual ' test_expect_success 'fail if attr magic is used places not implemented' ' @@ -166,7 +166,7 @@ test_expect_success 'fail if attr magic is used places not implemented' ' # though, but git-add is convenient as it has its own internal pathspec # parsing. test_must_fail git add ":(attr:labelB)" 2>actual && - test_i18ngrep "unsupported magic" actual + grep "unsupported magic" actual ' test_expect_success 'abort on giving invalid label on the command line' ' @@ -189,12 +189,12 @@ test_expect_success 'check attribute list' ' test_expect_success 'backslash cannot be the last character' ' test_must_fail git ls-files ":(attr:label=foo\\ labelA=bar)" 2>actual && - test_i18ngrep "not allowed as last character in attr value" actual + grep "not allowed as last character in attr value" actual ' test_expect_success 'backslash cannot be used as a value' ' test_must_fail git ls-files ":(attr:label=f\\\oo)" 2>actual && - test_i18ngrep "for value matching" actual + grep "for value matching" actual ' test_done diff --git a/t/t6301-for-each-ref-errors.sh b/t/t6301-for-each-ref-errors.sh index c734ce2388..cdb67a03b7 100755 --- a/t/t6301-for-each-ref-errors.sh +++ b/t/t6301-for-each-ref-errors.sh @@ -20,8 +20,8 @@ test_expect_success 'Broken refs are reported correctly' ' test_when_finished "rm -f .git/$r" && echo "warning: ignoring broken ref $r" >broken-err && git for-each-ref >out 2>err && - test_i18ncmp full-list out && - test_i18ncmp broken-err err + test_cmp full-list out && + test_cmp broken-err err ' test_expect_success 'NULL_SHA1 refs are reported correctly' ' @@ -31,10 +31,10 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' ' echo "warning: ignoring broken ref $r" >zeros-err && git for-each-ref >out 2>err && test_cmp full-list out && - test_i18ncmp zeros-err err && + test_cmp zeros-err err && git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err && test_cmp brief-list brief-out && - test_i18ncmp zeros-err brief-err + test_cmp zeros-err brief-err ' test_expect_success 'Missing objects are reported correctly' ' @@ -43,7 +43,7 @@ test_expect_success 'Missing objects are reported correctly' ' test_when_finished "rm -f .git/$r" && echo "fatal: missing object $MISSING for $r" >missing-err && test_must_fail git for-each-ref 2>err && - test_i18ncmp missing-err err && + test_cmp missing-err err && ( cat brief-list && echo "$MISSING $r" diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index cc7acd101d..c8dbe4baf4 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -16,7 +16,7 @@ test_expect_success 'gc does not leave behind pid file' ' test_expect_success 'gc --gobbledegook' ' test_expect_code 129 git gc --nonsense 2>err && - test_i18ngrep "[Uu]sage: git gc" err + grep "[Uu]sage: git gc" err ' test_expect_success 'gc -h with invalid configuration' ' @@ -27,7 +27,7 @@ test_expect_success 'gc -h with invalid configuration' ' echo "[gc] pruneexpire = CORRUPT" >>.git/config && test_expect_code 129 git gc -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + grep "[Uu]sage" broken/usage ' test_expect_success 'gc is not aborted due to a stale symref' ' @@ -59,7 +59,7 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre test_commit 790 && git gc --auto 2>err && - test_i18ngrep ! "^warning:" err && + ! grep "^warning:" err && ls .git/objects/pack/ | sort >post_packs && comm -1 -3 existing_packs post_packs >new && comm -2 -3 existing_packs post_packs >del && @@ -85,7 +85,7 @@ test_expect_success 'background auto gc does not run if gc.log is present and re test_config gc.autodetach true && echo fleem >.git/gc.log && test_must_fail git gc --auto 2>err && - test_i18ngrep "^error:" err && + grep "^error:" err && test_config gc.logexpiry 5.days && test-chmtime =-345600 .git/gc.log && test_must_fail git gc --auto && diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index e365d1ff77..fc9a333ded 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -425,7 +425,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule echo "warning: Could not find section in .gitmodules where path=sub" >expect.err && mkdir mod && git mv sub mod/sub 2>actual.err && - test_i18ncmp expect.err actual.err && + test_cmp expect.err actual.err && ! test -e sub && [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && ( @@ -452,7 +452,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u git mv sub sub2 && git commit -m "moved sub to sub2" && git checkout -q HEAD^ 2>actual && - test_i18ngrep "^warning: unable to rmdir sub2:" actual && + grep "^warning: unable to rmdir sub2:" actual && git status -s sub2 >actual && echo "?? sub2/" >expected && test_cmp expected actual && diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index bb2e4d704d..2eda27d684 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1334,7 +1334,7 @@ test_expect_success 'message in editor has initial comment: first line' ' # check the first line --- should be empty echo >first.expect && sed -e 1q first.actual && - test_i18ncmp first.expect first.actual + test_cmp first.expect first.actual ' test_expect_success \ diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh index 9d1abe50ef..76069916e5 100755 --- a/t/t7012-skip-worktree-writing.sh +++ b/t/t7012-skip-worktree-writing.sh @@ -125,13 +125,13 @@ EOF test_expect_success 'git-clean, absent case' ' setup_absent && git clean -n > result && - test_i18ncmp expected result + test_cmp expected result ' test_expect_success 'git-clean, dirty case' ' setup_dirty && git clean -n > result && - test_i18ncmp expected result + test_cmp expected result ' #TODO test_expect_failure 'git-apply adds file' false diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 53cf42fac1..f7fb5ad7ab 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -54,9 +54,9 @@ EOF git commit -m delete && test_must_fail git merge master && test_must_fail git commit --dry-run >../actual && - test_i18ncmp ../expect ../actual && + test_cmp ../expect ../actual && git status >../actual && - test_i18ncmp ../expect ../actual + test_cmp ../expect ../actual ) ' @@ -150,7 +150,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -185,7 +185,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -212,7 +212,7 @@ Unmerged paths: Untracked files not listed (use -u option to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual && + test_cmp expected actual && git reset --hard && git checkout master ' @@ -229,7 +229,7 @@ test_expect_success 'status --branch with detached HEAD' ' ?? expected ?? mdconflict/ EOF - test_i18ncmp expected actual + test_cmp expected actual ' ## Duplicate the above test and verify --porcelain=v1 arg parsing. @@ -245,7 +245,7 @@ test_expect_success 'status --porcelain=v1 --branch with detached HEAD' ' ?? expected ?? mdconflict/ EOF - test_i18ncmp expected actual + test_cmp expected actual ' ## Verify parser error on invalid --porcelain argument. diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 0667bd9dd3..4e1e290a9f 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -658,7 +658,7 @@ test_expect_success 'test ident field is working' ' cp -R done dthree dtwo four three ../other_worktree && GIT_WORK_TREE=../other_worktree git status 2>../err && echo "warning: Untracked cache is disabled on this system or location." >../expect && - test_i18ncmp ../expect ../err + test_cmp ../expect ../err ' test_done diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index 86f23be34a..9ac08264a9 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -66,14 +66,14 @@ test_expect_success 'reset --hard message' ' hex=$(git log -1 --format="%h") && git reset --hard > .actual && echo HEAD is now at $hex $(commit_msg) > .expected && - test_i18ncmp .expected .actual + test_cmp .expected .actual ' test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' ' hex=$(git log -1 --format="%h") && git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual && echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected && - test_i18ncmp .expected .actual + test_cmp .expected .actual ' >.diff_expect @@ -465,7 +465,7 @@ EOF test_expect_success '--mixed refreshes the index' ' echo 123 >> file2 && git reset --mixed HEAD > output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'resetting specific path that is unmerged' ' diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh index 98b7d7b969..7ca4727d25 100755 --- a/t/t7105-reset-patch.sh +++ b/t/t7105-reset-patch.sh @@ -28,14 +28,14 @@ test_expect_success PERL 'git reset -p' ' (echo n; echo y) | git reset -p >output && verify_state dir/foo work head && verify_saved_state bar && - test_i18ngrep "Unstage" output + grep "Unstage" output ' test_expect_success PERL 'git reset -p HEAD^' ' (echo n; echo y) | git reset -p HEAD^ >output && verify_state dir/foo work parent && verify_saved_state bar && - test_i18ngrep "Apply" output + grep "Apply" output ' # The idea in the rest is that bar sorts first, so we always say 'y' diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh index 0f95f00477..d71dfd3757 100755 --- a/t/t7106-reset-unborn-branch.sh +++ b/t/t7106-reset-unborn-branch.sh @@ -42,7 +42,7 @@ test_expect_success PERL 'reset -p' ' >expect && git ls-files >actual && test_cmp expect actual && - test_i18ngrep "Unstage" output + grep "Unstage" output ' test_expect_success 'reset --soft is a no-op' ' diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh index a82a07a04a..70cdd8e618 100755 --- a/t/t7110-reset-merge.sh +++ b/t/t7110-reset-merge.sh @@ -237,7 +237,7 @@ test_expect_success '"reset --keep HEAD^" fails with pending merge' ' git reset --hard third && test_must_fail git merge branch1 && test_must_fail git reset --keep HEAD^ 2>err.log && - test_i18ngrep "middle of a merge" err.log + grep "middle of a merge" err.log ' # The next test will test the following: @@ -263,7 +263,7 @@ test_expect_success '"reset --keep HEAD" fails with pending merge' ' git reset --hard third && test_must_fail git merge branch1 && test_must_fail git reset --keep HEAD 2>err.log && - test_i18ngrep "middle of a merge" err.log + grep "middle of a merge" err.log ' test_expect_success '--merge is ok with added/deleted merge' ' @@ -289,7 +289,7 @@ test_expect_success '--keep fails with added/deleted merge' ' git diff --exit-code file3 && git diff --exit-code branch3 file3 && test_must_fail git reset --keep HEAD 2>err.log && - test_i18ngrep "middle of a merge" err.log + grep "middle of a merge" err.log ' test_done diff --git a/t/t7201-co.sh b/t/t7201-co.sh index d4b217b0ee..32ffd2331d 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -222,10 +222,10 @@ test_expect_success 'switch to another branch while carrying a deletion' ' git rm two && test_must_fail git checkout simple 2>errs && - test_i18ngrep overwritten errs && + grep overwritten errs && git checkout --merge simple 2>errs && - test_i18ngrep ! overwritten errs && + ! grep overwritten errs && git ls-files -u && test_must_fail git cat-file -t :0:two && test "$(git cat-file -t :1:two)" = blob && @@ -238,7 +238,7 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' ' git config advice.detachedHead false && git checkout -f renamer && git clean -f && git checkout renamer^ 2>messages && - test_i18ngrep "HEAD is now at 7329388" messages && + grep "HEAD is now at 7329388" messages && test_line_count = 1 messages && H=$(git rev-parse --verify HEAD) && M=$(git show-ref -s --verify refs/heads/master) && @@ -256,8 +256,8 @@ test_expect_success 'checkout to detach HEAD' ' git config advice.detachedHead true && git checkout -f renamer && git clean -f && git checkout renamer^ 2>messages && - test_i18ngrep "HEAD is now at 7329388" messages && - (test_line_count -gt 1 messages || test -n "$GETTEXT_POISON") && + grep "HEAD is now at 7329388" messages && + test_line_count -gt 1 messages && H=$(git rev-parse --verify HEAD) && M=$(git show-ref -s --verify refs/heads/master) && test "z$H" = "z$M" && diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6ad..74be532fc7 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -110,7 +110,7 @@ test_expect_success 'git clean with prefix' ' ' -test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' ' +test_expect_success 'git clean with relative prefix' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && @@ -122,7 +122,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' ' verbose test "$would_clean" = ../src/part3.c ' -test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' ' +test_expect_success 'git clean with absolute path' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && @@ -405,7 +405,7 @@ test_expect_success 'clean.requireForce and -f' ' ' -test_expect_success C_LOCALE_OUTPUT 'core.excludesfile' ' +test_expect_success 'core.excludesfile' ' echo excludes >excludes && echo included >included && diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index c2706fe472..18dc22863c 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -27,7 +27,7 @@ test_expect_success 'submodule init aborts on missing .gitmodules file' ' git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && # missing the .gitmodules file here test_must_fail git submodule init 2>actual && - test_i18ngrep "No url found for submodule path" actual + grep "No url found for submodule path" actual ' test_expect_success 'submodule update aborts on missing .gitmodules file' ' @@ -35,7 +35,7 @@ test_expect_success 'submodule update aborts on missing .gitmodules file' ' git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && # missing the .gitmodules file here git submodule update sub 2>actual && - test_i18ngrep "Submodule path .sub. not initialized" actual + grep "Submodule path .sub. not initialized" actual ' test_expect_success 'configuration parsing' ' @@ -141,7 +141,7 @@ test_expect_success 'submodule add to .gitignored path fails' ' git add --force .gitignore && git commit -m"Ignore everything" && ! git submodule add "$submodurl" submod >actual 2>&1 && - test_i18ncmp expect actual + test_cmp expect actual ) ' @@ -310,7 +310,7 @@ test_expect_success 'submodule add in subdirectory with relative path should fai cd addtest/sub && test_must_fail git submodule add ../../ submod3 2>../../output.err ) && - test_i18ngrep toplevel output.err + grep toplevel output.err ' test_expect_success 'setup - add an example entry to .gitmodules' ' @@ -512,7 +512,7 @@ test_expect_success 'update --init' ' git submodule update init 2> update.out && cat update.out && - test_i18ngrep "not initialized" update.out && + grep "not initialized" update.out && test_must_fail git rev-parse --resolve-git-dir init/.git && git submodule update --init init && @@ -530,7 +530,7 @@ test_expect_success 'update --init from subdirectory' ' cd sub && git submodule update ../init 2>update.out && cat update.out && - test_i18ngrep "not initialized" update.out && + grep "not initialized" update.out && test_must_fail git rev-parse --resolve-git-dir ../init/.git && git submodule update --init ../init @@ -970,7 +970,7 @@ test_expect_success 'submodule deinit from subdirectory' ' cd sub && git submodule deinit ../init >../output ) && - test_i18ngrep "\\.\\./init" output && + grep "\\.\\./init" output && test -z "$(git config --get-regexp "submodule\.example\.")" && test -n "$(git config --get-regexp "submodule\.example2\.")" && test -f example2/.git && @@ -985,8 +985,8 @@ test_expect_success 'submodule deinit . deinits all initialized submodules' ' git submodule deinit . >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && test -z "$(git config --get-regexp "submodule\.example2\.")" && - test_i18ngrep "Cleared directory .init" actual && - test_i18ngrep "Cleared directory .example2" actual && + grep "Cleared directory .init" actual && + grep "Cleared directory .example2" actual && rmdir init example2 ' @@ -998,8 +998,8 @@ test_expect_success 'submodule deinit --all deinits all initialized submodules' git submodule deinit --all >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && test -z "$(git config --get-regexp "submodule\.example2\.")" && - test_i18ngrep "Cleared directory .init" actual && - test_i18ngrep "Cleared directory .example2" actual && + grep "Cleared directory .init" actual && + grep "Cleared directory .example2" actual && rmdir init example2 ' @@ -1009,8 +1009,8 @@ test_expect_success 'submodule deinit deinits a submodule when its work tree is git submodule deinit init example2 >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && test -z "$(git config --get-regexp "submodule\.example2\.")" && - test_i18ngrep ! "Cleared directory .init" actual && - test_i18ngrep "Cleared directory .example2" actual && + ! grep "Cleared directory .init" actual && + grep "Cleared directory .example2" actual && rmdir init ' @@ -1022,7 +1022,7 @@ test_expect_success 'submodule deinit fails when the submodule contains modifica test -f example2/.git && git submodule deinit -f init >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && - test_i18ngrep "Cleared directory .init" actual && + grep "Cleared directory .init" actual && rmdir init ' @@ -1034,7 +1034,7 @@ test_expect_success 'submodule deinit fails when the submodule contains untracke test -f example2/.git && git submodule deinit -f init >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && - test_i18ngrep "Cleared directory .init" actual && + grep "Cleared directory .init" actual && rmdir init ' @@ -1049,30 +1049,30 @@ test_expect_success 'submodule deinit fails when the submodule HEAD does not mat test -f example2/.git && git submodule deinit -f init >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && - test_i18ngrep "Cleared directory .init" actual && + grep "Cleared directory .init" actual && rmdir init ' test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' ' git submodule update --init && git submodule deinit init >actual && - test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual && - test_i18ngrep "Cleared directory .init" actual && + grep "Submodule .example. (.*) unregistered for path .init" actual && + grep "Cleared directory .init" actual && git submodule deinit init >actual && - test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && - test_i18ngrep "Cleared directory .init" actual && + ! grep "Submodule .example. (.*) unregistered for path .init" actual && + grep "Cleared directory .init" actual && git submodule deinit . >actual && - test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && - test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual && - test_i18ngrep "Cleared directory .init" actual && + ! grep "Submodule .example. (.*) unregistered for path .init" actual && + grep "Submodule .example2. (.*) unregistered for path .example2" actual && + grep "Cleared directory .init" actual && git submodule deinit . >actual && - test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && - test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual && - test_i18ngrep "Cleared directory .init" actual && + ! grep "Submodule .example. (.*) unregistered for path .init" actual && + ! grep "Submodule .example2. (.*) unregistered for path .example2" actual && + grep "Cleared directory .init" actual && git submodule deinit --all >actual && - test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && - test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual && - test_i18ngrep "Cleared directory .init" actual && + ! grep "Submodule .example. (.*) unregistered for path .init" actual && + ! grep "Submodule .example2. (.*) unregistered for path .example2" actual && + grep "Cleared directory .init" actual && rmdir init example2 ' diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 366746f0d4..7e75c10fc0 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -182,7 +182,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' " < Add foo5 EOF - test_i18ncmp actual expected + test_cmp actual expected " test_expect_success 'typechanged submodule(submodule->blob), --files' " @@ -192,7 +192,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --files' " > Add foo5 EOF - test_i18ncmp actual expected + test_cmp actual expected " rm -rf sm1 && @@ -203,7 +203,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' " * sm1 $head4(submodule)->$head5(blob): EOF - test_i18ncmp actual expected + test_cmp actual expected " rm -f sm1 && @@ -216,7 +216,7 @@ test_expect_success 'nonexistent commit' " Warn: sm1 doesn't contain commit $head4_full EOF - test_i18ncmp actual expected + test_cmp actual expected " commit_file @@ -227,7 +227,7 @@ test_expect_success 'typechanged submodule(blob->submodule)' " > Add foo7 EOF - test_i18ncmp expected actual + test_cmp expected actual " commit_file sm1 && @@ -282,7 +282,7 @@ EOF test_expect_success '--for-status' " git submodule summary --for-status HEAD^ >actual && - test_i18ncmp actual - <../../output ) && - test_i18ngrep "\\.\\./submodule" output && + grep "\\.\\./submodule" output && test -d "$( cd super-clone/submodule && git config remote.origin.url @@ -188,7 +188,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul cd sub && git submodule sync --recursive >../../output ) && - test_i18ngrep "\\.\\./submodule/sub-submodule" output && + grep "\\.\\./submodule/sub-submodule" output && test -d "$( cd super-clone/submodule && git config remote.origin.url diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 4ac386d98b..e13d8b0650 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -136,8 +136,8 @@ test_expect_success 'submodule update --init --recursive from subdirectory' ' cd tmp && git submodule update --init --recursive ../super >../../actual 2>../../actual2 ) && - test_i18ncmp expect actual && - test_i18ncmp expect2 actual2 + test_cmp expect actual && + test_cmp expect2 actual2 ' cat <expect2 @@ -154,7 +154,7 @@ test_expect_success 'submodule update --init from and of subdirectory' ' git submodule update --init sub 2>../../actual2 ) ) && - test_i18ncmp expect2 actual2 + test_cmp expect2 actual2 ' apos="'"; @@ -173,7 +173,7 @@ test_expect_success 'submodule update does not fetch already present commits' ' (cd super && git submodule update > ../actual 2> ../actual.err ) && - test_i18ncmp expected actual && + test_cmp expected actual && ! test -s actual.err ' @@ -420,7 +420,7 @@ test_expect_success 'submodule update - command in .git/config catches failure' (cd super && test_must_fail git submodule update submodule 2>../actual ) && - test_i18ncmp actual expect + test_cmp actual expect ' cat << EOF >expect @@ -438,7 +438,7 @@ test_expect_success 'submodule update - command in .git/config catches failure - mkdir tmp && cd tmp && test_must_fail git submodule update ../submodule 2>../../actual ) && - test_i18ncmp actual expect + test_cmp actual expect ' test_expect_success 'submodule update - command run for initial population of submodule' ' @@ -468,7 +468,7 @@ test_expect_success 'recursive submodule update - command in .git/config catches mkdir -p tmp && cd tmp && test_must_fail git submodule update --recursive ../super 2>../../actual ) && - test_i18ncmp actual expect + test_cmp actual expect ' test_expect_success 'submodule init does not copy command into .git/config' ' @@ -853,7 +853,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re git clone super_update_r super_update_r2 && (cd super_update_r2 && git submodule update --init --recursive >actual && - test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && + grep "Submodule path .submodule/subsubmodule.: checked out" actual && (cd submodule/subsubmodule && git log > ../../expected ) && @@ -927,7 +927,7 @@ test_expect_success 'submodule update clone shallow submodule outside of depth' sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp && mv -f .gitmodules.tmp .gitmodules && test_must_fail git submodule update --init --depth=1 2>actual && - test_i18ngrep "Direct fetching of that commit failed." actual && + grep "Direct fetching of that commit failed." actual && git -C ../submodule config uploadpack.allowReachableSHA1InWant true && git submodule update --init --depth=1 >actual && test 1 = $(git -C submodule log --oneline | wc -l) @@ -940,7 +940,7 @@ test_expect_success 'submodule update --recursive drops module name before recur git checkout HEAD^ ) && git submodule update --recursive deeper/submodule >actual && - test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual + grep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual ) ' diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 6ba5daf42e..86aeea9ded 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -77,7 +77,7 @@ test_expect_success 'test basic "submodule foreach" usage' ' git config foo.bar zar && git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar" ) && - test_i18ncmp expect actual + test_cmp expect actual ' cat >expect <../../actual ) && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'setup nested submodules' ' @@ -174,7 +174,7 @@ test_expect_success 'test messages from "foreach --recursive"' ' cd clone2 && git submodule foreach --recursive "true" > ../actual ) && - test_i18ncmp expect actual + test_cmp expect actual ' cat > expect <../../actual ) && - test_i18ncmp expect actual + test_cmp expect actual ' cat > expect <actual_err && - test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null + grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null ) ' diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh index e2bbb449b6..3f6d12d15a 100755 --- a/t/t7412-submodule-absorbgitdirs.sh +++ b/t/t7412-submodule-absorbgitdirs.sh @@ -122,7 +122,7 @@ test_expect_success 'setup a submodule with multiple worktrees' ' test_expect_success 'absorbing fails for a submodule with multiple worktrees' ' test_must_fail git submodule absorbgitdirs sub3 2>error && - test_i18ngrep "not supported" error + grep "not supported" error ' test_done diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index 116885a260..50b6566d4d 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -15,7 +15,7 @@ commit_msg_is () { printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" && printf "%s" "$1" >"$expect" && - test_i18ncmp "$expect" "$actual" + test_cmp "$expect" "$actual" } # A sanity check to see if commit is working at all. diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 0b6da7ae1f..652db9f82f 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -18,7 +18,7 @@ test_expect_success 'initial status' ' echo bongo bongo >file && git add file && git status >actual && - test_i18ngrep "Initial commit" actual + grep "Initial commit" actual ' test_expect_success 'fail initial amend' ' @@ -126,7 +126,7 @@ test_expect_success 'template "emptyness" check does not kick in with -F' ' test_expect_success 'template "emptyness" check' ' git checkout HEAD file && echo >>file && git add file && test_must_fail git commit -t file 2>err && - test_i18ngrep "did not edit" err + grep "did not edit" err ' test_expect_success 'setup: commit message from file' ' @@ -636,7 +636,7 @@ test_expect_success 'commit a file whose name is a dash' ' git add ./- && test_tick && git commit -m "add dash" >output $actual && printf "%s" "$1" >$expect && - test_i18ncmp $expect $actual + test_cmp $expect $actual } # Arguments: [] [] @@ -31,7 +31,7 @@ check_summary_oneline() { SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')" echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp && - test_i18ncmp exp act + test_cmp exp act } test_expect_success 'output summary format' ' @@ -286,7 +286,7 @@ echo "sample # with '#' will be ignored, and an empty message aborts the commit." >expect test_expect_success 'cleanup commit messages (strip option,-F,-e): output' ' - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' ' @@ -361,14 +361,14 @@ test_expect_success 'cleanup commit message (whitespace config, -m)' ' test_expect_success 'message shows author when it is not equal to committer' ' echo >>negative && git commit -e -m "sample" -a && - test_i18ngrep \ + grep \ "^# Author: *A U Thor \$" \ .git/COMMIT_EDITMSG ' test_expect_success 'message shows date when it is explicitly set' ' git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" && - test_i18ngrep \ + grep \ "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \ .git/COMMIT_EDITMSG ' @@ -383,7 +383,7 @@ test_expect_success AUTOIDENT 'message shows committer when it is automatic' ' ) && # the ident is calculated from the system, so we cannot # check the actual value, only that it is there - test_i18ngrep "^# Committer: " .git/COMMIT_EDITMSG + grep "^# Committer: " .git/COMMIT_EDITMSG ' write_script .git/FAKE_EDITOR <output && - test_i18ngrep "nothing to commit" output + grep "nothing to commit" output ' test_expect_success 'commit --dry-run -a clean' ' test_must_fail git commit --dry-run -a >output && - test_i18ngrep "nothing to commit" output + grep "nothing to commit" output ' test_expect_success 'status with modified file in submodule' ' (cd sub && git reset --hard) && echo "changed" >sub/foo && git status >output && - test_i18ngrep "modified: sub (modified content)" output + grep "modified: sub (modified content)" output ' test_expect_success 'status with modified file in submodule (porcelain)' ' @@ -68,7 +68,7 @@ test_expect_success 'status with modified file in submodule (short)' ' test_expect_success 'status with added file in submodule' ' (cd sub && git reset --hard && echo >foo && git add foo) && git status >output && - test_i18ngrep "modified: sub (modified content)" output + grep "modified: sub (modified content)" output ' test_expect_success 'status with added file in submodule (porcelain)' ' @@ -91,12 +91,12 @@ test_expect_success 'status with untracked file in submodule' ' (cd sub && git reset --hard) && echo "content" >sub/new-file && git status >output && - test_i18ngrep "modified: sub (untracked content)" output + grep "modified: sub (untracked content)" output ' test_expect_success 'status -uno with untracked file in submodule' ' git status -uno >output && - test_i18ngrep "^nothing to commit" output + grep "^nothing to commit" output ' test_expect_success 'status with untracked file in submodule (porcelain)' ' @@ -117,7 +117,7 @@ test_expect_success 'status with added and untracked file in submodule' ' (cd sub && git reset --hard && echo >foo && git add foo) && echo "content" >sub/new-file && git status >output && - test_i18ngrep "modified: sub (modified content, untracked content)" output + grep "modified: sub (modified content, untracked content)" output ' test_expect_success 'status with added and untracked file in submodule (porcelain)' ' @@ -135,7 +135,7 @@ test_expect_success 'status with modified file in modified submodule' ' (cd sub && echo "next change" >foo && git commit -m "next change" foo) && echo "changed" >sub/foo && git status >output && - test_i18ngrep "modified: sub (new commits, modified content)" output + grep "modified: sub (new commits, modified content)" output ' test_expect_success 'status with modified file in modified submodule (porcelain)' ' @@ -150,7 +150,7 @@ test_expect_success 'status with modified file in modified submodule (porcelain) test_expect_success 'status with added file in modified submodule' ' (cd sub && git reset --hard && echo >foo && git add foo) && git status >output && - test_i18ngrep "modified: sub (new commits, modified content)" output + grep "modified: sub (new commits, modified content)" output ' test_expect_success 'status with added file in modified submodule (porcelain)' ' @@ -165,7 +165,7 @@ test_expect_success 'status with untracked file in modified submodule' ' (cd sub && git reset --hard) && echo "content" >sub/new-file && git status >output && - test_i18ngrep "modified: sub (new commits, untracked content)" output + grep "modified: sub (new commits, untracked content)" output ' test_expect_success 'status with untracked file in modified submodule (porcelain)' ' @@ -179,7 +179,7 @@ test_expect_success 'status with added and untracked file in modified submodule' (cd sub && git reset --hard && echo >foo && git add foo) && echo "content" >sub/new-file && git status >output && - test_i18ngrep "modified: sub (new commits, modified content, untracked content)" output + grep "modified: sub (new commits, modified content, untracked content)" output ' test_expect_success 'status with added and untracked file in modified submodule (porcelain)' ' @@ -204,7 +204,7 @@ test_expect_success 'setup .git file for sub' ' test_expect_success 'status with added file in modified submodule with .git file' ' (cd sub && git reset --hard && echo >foo && git add foo) && git status >output && - test_i18ngrep "modified: sub (new commits, modified content)" output + grep "modified: sub (new commits, modified content)" output ' test_expect_success 'status with a lot of untracked files in the submodule' ' @@ -229,12 +229,12 @@ test_expect_success 'rm submodule contents' ' test_expect_success 'status clean (empty submodule dir)' ' git status >output && - test_i18ngrep "nothing to commit" output + grep "nothing to commit" output ' test_expect_success 'status -a clean (empty submodule dir)' ' test_must_fail git commit --dry-run -a >output && - test_i18ngrep "nothing to commit" output + grep "nothing to commit" output ' cat >status_expect <<\EOF diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index ed2653d46f..2da4675559 100755 --- a/t/t7507-commit-verbose.sh +++ b/t/t7507-commit-verbose.sh @@ -86,7 +86,7 @@ test_expect_success 'submodule log is stripped out too with -v' ' export GIT_EDITOR && test_must_fail git commit -a -v 2>err ) && - test_i18ngrep "Aborting commit due to empty commit message." err + grep "Aborting commit due to empty commit message." err ' test_expect_success 'verbose diff is stripped out with set core.commentChar' ' @@ -95,7 +95,7 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' ' export GIT_EDITOR && test_must_fail git -c core.commentchar=";" commit -a -v 2>err ) && - test_i18ngrep "Aborting commit due to empty commit message." err + grep "Aborting commit due to empty commit message." err ' test_expect_success 'status does not verbose without --verbose' ' diff --git a/t/t7508-status.sh b/t/t7508-status.sh index fb00e6d9b0..257b4bf7c3 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -17,7 +17,7 @@ test_expect_success 'status -h in broken repository' ' echo "[status] showuntrackedfiles = CORRUPT" >>.git/config && test_expect_code 129 git status -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + grep "[Uu]sage" broken/usage ' test_expect_success 'commit -h in broken repository' ' @@ -29,7 +29,7 @@ test_expect_success 'commit -h in broken repository' ' echo "[status] showuntrackedfiles = CORRUPT" >>.git/config && test_expect_code 129 git commit -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + grep "[Uu]sage" broken/usage ' test_expect_success 'setup' ' @@ -57,7 +57,7 @@ test_expect_success 'setup' ' ' test_expect_success 'status (1)' ' - test_i18ngrep "use \"git rm --cached \.\.\.\" to unstage" output + grep "use \"git rm --cached \.\.\.\" to unstage" output ' strip_comments () { @@ -94,13 +94,13 @@ test_expect_success 'status --column' ' # EOF COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status --column status.displayCommentPrefix=false' ' strip_comments expect && COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <<\EOF @@ -128,19 +128,19 @@ EOF test_expect_success 'status with status.displayCommentPrefix=true' ' git -c status.displayCommentPrefix=true status >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status with status.displayCommentPrefix=false' ' strip_comments expect && git -c status.displayCommentPrefix=false status >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status -v' ' (cat expect && git diff --cached) >expect-with-v && git status -v >output && - test_i18ncmp expect-with-v output + test_cmp expect-with-v output ' test_expect_success 'status -v -v' ' @@ -151,7 +151,7 @@ test_expect_success 'status -v -v' ' echo "Changes not staged for commit:" && git -c diff.mnemonicprefix=true diff) >expect-with-v && git status -v -v >output && - test_i18ncmp expect-with-v output + test_cmp expect-with-v output ' test_expect_success 'setup fake editor' ' @@ -195,7 +195,7 @@ EOF test_expect_success 'status (advice.statusHints false)' ' test_config advice.statusHints false && git status >output && - test_i18ncmp expect output + test_cmp expect output ' @@ -277,7 +277,7 @@ Ignored files: EOF git status --ignored >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status with gitignore (nothing untracked)' ' @@ -338,7 +338,7 @@ Ignored files: EOF git status --ignored >output && - test_i18ncmp expect output + test_cmp expect output ' cat >.gitignore <<\EOF @@ -396,13 +396,13 @@ Changes not staged for commit: Untracked files not listed (use -u option to show untracked files) EOF git status -uno >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status (status.showUntrackedFiles no)' ' test_config status.showuntrackedfiles no && git status >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status -uno (advice.statusHints false)' ' @@ -418,7 +418,7 @@ Untracked files not listed EOF test_config advice.statusHints false && git status -uno >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect << EOF @@ -461,13 +461,13 @@ Untracked files: EOF git status -unormal >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status (status.showUntrackedFiles normal)' ' test_config status.showuntrackedfiles normal && git status >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status (status.showUntrackedFiles all)' ' test_config status.showuntrackedfiles all && git status >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'teardown dir3' ' @@ -573,7 +573,7 @@ Untracked files: EOF (cd dir1 && git status) >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <<\EOF @@ -639,13 +639,13 @@ Untracked files: EOF test_config color.ui always && git status | test_decode_color >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status with color.status' ' test_config color.status always && git status | test_decode_color >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <<\EOF @@ -761,7 +761,7 @@ Untracked files: EOF test_config status.relativePaths false && (cd dir1 && git status) >output && - test_i18ncmp expect output + test_cmp expect output ' @@ -799,7 +799,7 @@ Untracked files: EOF git commit --dry-run dir1/modified >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <output && - test_i18ncmp expect output + test_cmp expect output ' # we expect the same as the previous test test_expect_success 'status --untracked-files=all does not show submodule' ' git status --untracked-files=all >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'status submodule summary with status.displayCommentPrefix=false' ' strip_comments expect && git -c status.displayCommentPrefix=false status >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' ' @@ -958,9 +958,9 @@ EOF git commit -m "commit submodule" && git config status.submodulesummary 10 && test_must_fail git commit --dry-run >output && - test_i18ncmp expect output && + test_cmp expect output && git status >output && - test_i18ncmp expect output + test_cmp expect output ' cat >expect <output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' ' @@ -1066,17 +1066,17 @@ Untracked files: EOF echo modified sm/untracked && git status --ignore-submodules=untracked >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' ' test_config diff.ignoreSubmodules dirty && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --add -f .gitmodules submodule.subname.ignore untracked && git config --add -f .gitmodules submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1086,14 +1086,14 @@ test_expect_success '.git/config ignore=untracked suppresses submodules with unt git config --add submodule.subname.ignore untracked && git config --add submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config --remove-section -f .gitmodules submodule.subname ' test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' ' git status --ignore-submodules=dirty >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' ' @@ -1103,7 +1103,7 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with untrack git config --add -f .gitmodules submodule.subname.ignore dirty && git config --add -f .gitmodules submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1113,7 +1113,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack git config --add submodule.subname.ignore dirty && git config --add submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' @@ -1121,14 +1121,14 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' ' echo modified >sm/foo && git status --ignore-submodules=dirty >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' ' git config --add -f .gitmodules submodule.subname.ignore dirty && git config --add -f .gitmodules submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1138,7 +1138,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with modifie git config --add submodule.subname.ignore dirty && git config --add submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' @@ -1175,14 +1175,14 @@ Untracked files: EOF git status --ignore-submodules=untracked > output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" ' git config --add -f .gitmodules submodule.subname.ignore untracked && git config --add -f .gitmodules submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1192,7 +1192,7 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodules wi git config --add submodule.subname.ignore untracked && git config --add submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' @@ -1235,14 +1235,14 @@ Untracked files: EOF git status --ignore-submodules=untracked > output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" ' git config --add -f .gitmodules submodule.subname.ignore untracked && git config --add -f .gitmodules submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1252,20 +1252,20 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodule sum git config --add submodule.subname.ignore untracked && git config --add submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" ' git status --ignore-submodules=dirty > output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" ' git config --add -f .gitmodules submodule.subname.ignore dirty && git config --add -f .gitmodules submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1275,7 +1275,7 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary git config --add submodule.subname.ignore dirty && git config --add submodule.subname.path sm && git status >output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' @@ -1318,7 +1318,7 @@ EOF test_expect_success "status (core.commentchar with submodule summary)" ' test_config core.commentchar ";" && git -c status.displayCommentPrefix=true status >output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success "status (core.commentchar with two chars with submodule summary)" ' @@ -1347,7 +1347,7 @@ Untracked files: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --ignore-submodules=all > output && - test_i18ncmp expect output + test_cmp expect output ' test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' ' @@ -1377,7 +1377,7 @@ EOF git config --add -f .gitmodules submodule.subname.ignore all && git config --add -f .gitmodules submodule.subname.path sm && git status > output && - test_i18ncmp expect output && + test_cmp expect output && git config -f .gitmodules --remove-section submodule.subname ' @@ -1387,7 +1387,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar git config --add submodule.subname.ignore all && git config --add submodule.subname.path sm && git status > output && - test_i18ncmp expect output && + test_cmp expect output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' @@ -1459,12 +1459,12 @@ test_expect_success 'git commit will commit a staged but ignored submodule' ' git config --add -f .gitmodules submodule.subname.path sm && git config --add submodule.subname.ignore all && git status -s --ignore-submodules=dirty >output && - test_i18ngrep "^M. sm" output && + grep "^M. sm" output && GIT_EDITOR="echo hello >>\"\$1\"" && export GIT_EDITOR && git commit -uno && git status -s --ignore-submodules=dirty >output && - test_i18ngrep ! "^M. sm" output + ! grep "^M. sm" output ' test_expect_success 'git commit --dry-run will show a staged but ignored submodule' ' @@ -1486,15 +1486,15 @@ Changes not staged for commit: Untracked files not listed (use -u option to show untracked files) EOF git commit -uno --dry-run >output && - test_i18ncmp expect output && + test_cmp expect output && git status -s --ignore-submodules=dirty >output && - test_i18ngrep "^M. sm" output + grep "^M. sm" output ' test_expect_success 'git commit -m will commit a staged but ignored submodule' ' git commit -uno -m message && git status -s --ignore-submodules=dirty >output && - test_i18ngrep ! "^M. sm" output && + ! grep "^M. sm" output && git config --remove-section submodule.subname && git config -f .gitmodules --remove-section submodule.subname ' diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 458608cc1e..13c631112d 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -39,7 +39,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -60,7 +60,7 @@ Changes to be committed: Untracked files not listed (use -u option to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -93,7 +93,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -117,7 +117,7 @@ Changes to be committed: Untracked files not listed (use -u option to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -156,7 +156,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -183,7 +183,7 @@ Changes to be committed: Untracked files not listed (use -u option to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -213,7 +213,7 @@ You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -253,7 +253,7 @@ Changes not staged for commit: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -286,7 +286,7 @@ You are currently editing a commit while rebasing branch '\''amend_last'\'' on ' nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -325,7 +325,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -361,7 +361,7 @@ Changes not staged for commit: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -392,7 +392,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -423,7 +423,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -460,7 +460,7 @@ Changes not staged for commit: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -492,7 +492,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -525,7 +525,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -564,7 +564,7 @@ Changes not staged for commit: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -598,7 +598,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -626,7 +626,7 @@ You are in the middle of an am session. nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -648,7 +648,7 @@ You are in the middle of an am session. nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -671,7 +671,7 @@ The current patch is empty. nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -694,7 +694,7 @@ You are currently bisecting, started from branch '\''bisect'\''. nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -719,7 +719,7 @@ Unmerged paths: no changes added to commit EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -753,7 +753,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' @@ -777,7 +777,7 @@ Changes to be committed: Untracked files not listed (use -u option to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status showing detached at and from a tag' ' @@ -788,7 +788,7 @@ HEAD detached at atag nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual && + test_cmp expected actual && git reset --hard HEAD^ && cat >expected <<\EOF && @@ -796,7 +796,7 @@ HEAD detached from atag nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status while reverting commit (conflicts)' ' @@ -824,7 +824,7 @@ Unmerged paths: no changes added to commit (use "git add" and/or "git commit -a") EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status while reverting commit (conflicts resolved)' ' @@ -844,7 +844,7 @@ Changes to be committed: Untracked files not listed (use -u option to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status after reverting commit' ' @@ -854,7 +854,7 @@ On branch master nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'prepare for different number of commits rebased' ' @@ -884,7 +884,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\'' nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status: two commands done with some white lines in done file' ' @@ -912,7 +912,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\'' nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status: two remaining commands with some white lines in todo file' ' @@ -941,7 +941,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\'' nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_expect_success 'status: handle not-yet-started rebase -i gracefully' ' @@ -960,7 +960,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\'' nothing to commit (use -u to show untracked files) EOF - test_i18ncmp expected actual + test_cmp expected actual ' test_done diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh index b22f631261..aebbe17204 100755 --- a/t/t7518-ident-corner-cases.sh +++ b/t/t7518-ident-corner-cases.sh @@ -13,7 +13,7 @@ test_expect_success 'empty name and missing email' ' sane_unset GIT_AUTHOR_EMAIL && GIT_AUTHOR_NAME= && test_must_fail git commit --allow-empty -m foo 2>err && - test_i18ngrep ! null err + ! grep null err ) ' @@ -29,7 +29,7 @@ test_expect_success 'empty configured name does not auto-detect' ' sane_unset GIT_AUTHOR_NAME && test_must_fail \ git -c user.name= commit --allow-empty -m foo 2>err && - test_i18ngrep "empty ident name" err + grep "empty ident name" err ) ' diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 2ebda509ac..c288c6b26e 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -169,7 +169,7 @@ test_expect_success 'merge -h with invalid index' ' >.git/index && test_expect_code 129 git merge -h 2>usage ) && - test_i18ngrep "[Uu]sage: git merge" broken/usage + grep "[Uu]sage: git merge" broken/usage ' test_expect_success 'reject non-strategy with a git-merge-foo name' ' @@ -615,7 +615,7 @@ test_debug 'git log --graph --decorate --oneline --all' test_expect_success 'in-index merge' ' git reset --hard c0 && git merge --no-ff -s resolve c1 >out && - test_i18ngrep "Wonderful." out && + grep "Wonderful." out && verify_parents $c0 $c1 ' diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 6abe441ae3..2b9cc6fc85 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -66,7 +66,7 @@ EOF test_expect_success 'merge output uses pretty names' ' git reset --hard c1 && git merge c2 c3 c4 >actual && - test_i18ncmp expected actual + test_cmp expected actual ' cat >expected <<\EOF @@ -78,7 +78,7 @@ EOF test_expect_success 'merge reduces irrelevant remote heads' ' GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual && - test_i18ncmp expected actual + test_cmp expected actual ' cat >expected <<\EOF @@ -95,7 +95,7 @@ EOF test_expect_success 'merge fast-forward output uses pretty names' ' git reset --hard c0 && git merge c1 c2 >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_done diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 9444d6a9b9..dcd2299041 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -125,7 +125,7 @@ test_expect_success 'will not overwrite untracked file in leading path' ' cp important sub && cp important sub2 && test_must_fail git merge sub 2>out && - test_i18ncmp out expect && + test_cmp out expect && test_path_is_missing .git/MERGE_HEAD && test_cmp important sub && test_cmp important sub2 && @@ -160,7 +160,7 @@ test_expect_success 'will not overwrite untracked file on unborn branch' ' git checkout --orphan new && cp important c0.c && test_must_fail git merge c0 2>out && - test_i18ncmp out expect + test_cmp out expect ' test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' ' diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index e90413204e..f9460206fa 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -37,14 +37,14 @@ EOF test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' ' test_must_fail git merge branch 2>out && - test_i18ncmp out expect && + test_cmp out expect && git commit --allow-empty -m empty && ( GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY && test_must_fail git merge branch 2>out2 ) && - test_i18ncmp out2 expect && + test_cmp out2 expect && git reset --hard HEAD^ ' @@ -65,7 +65,7 @@ test_expect_success 'untracked files or local changes ovewritten by merge' ' git add three && git add four && test_must_fail git merge branch 2>out && - test_i18ncmp out expect + test_cmp out expect ' cat >expect <<\EOF @@ -87,7 +87,7 @@ test_expect_success 'cannot switch branches because of local changes' ' echo uno >rep/one && echo dos >rep/two && test_must_fail git checkout branch 2>out && - test_i18ncmp out expect + test_cmp out expect ' cat >expect <<\EOF @@ -101,7 +101,7 @@ EOF test_expect_success 'not uptodate file porcelain checkout error' ' git add rep/one rep/two && test_must_fail git checkout branch 2>out && - test_i18ncmp out expect + test_cmp out expect ' cat >expect <<\EOF @@ -132,7 +132,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' ' >rep/untracked-file && >rep2/untracked-file && test_must_fail git checkout branch 2>out && - test_i18ncmp out ../expect + test_cmp out ../expect ' test_done diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh index 7b4798e8e4..f881ebd96a 100755 --- a/t/t7611-merge-abort.sh +++ b/t/t7611-merge-abort.sh @@ -47,7 +47,7 @@ pre_merge_head="$(git rev-parse HEAD)" test_expect_success 'fails without MERGE_HEAD (unstarted merge)' ' test_must_fail git merge --abort 2>output && - test_i18ngrep MERGE_HEAD output + grep MERGE_HEAD output ' test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' ' @@ -61,7 +61,7 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' ' # Merge successfully completed post_merge_head="$(git rev-parse HEAD)" && test_must_fail git merge --abort 2>output && - test_i18ngrep MERGE_HEAD output + grep MERGE_HEAD output ' test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' ' diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh index 8ae69a61c3..a6e9eb0de9 100755 --- a/t/t7612-merge-verify-signatures.sh +++ b/t/t7612-merge-verify-signatures.sh @@ -36,22 +36,22 @@ test_expect_success GPG 'create signed commits' ' test_expect_success GPG 'merge unsigned commit with verification' ' test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror && - test_i18ngrep "does not have a GPG signature" mergeerror + grep "does not have a GPG signature" mergeerror ' test_expect_success GPG 'merge commit with bad signature with verification' ' test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror && - test_i18ngrep "has a bad GPG signature" mergeerror + grep "has a bad GPG signature" mergeerror ' test_expect_success GPG 'merge commit with untrusted signature with verification' ' test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror && - test_i18ngrep "has an untrusted GPG signature" mergeerror + grep "has an untrusted GPG signature" mergeerror ' test_expect_success GPG 'merge signed commit with verification' ' git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput && - test_i18ngrep "has a good GPG signature" mergeoutput + grep "has a good GPG signature" mergeoutput ' test_expect_success GPG 'merge commit with bad signature without verification' ' diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index cee42097b0..de78f24392 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -1032,7 +1032,7 @@ test_expect_success 'grep --no-index pattern -- path' ' test_expect_success 'grep --no-index complains of revs' ' test_must_fail git grep --no-index o master -- 2>err && - test_i18ngrep "cannot be used with revs" err + grep "cannot be used with revs" err ' test_expect_success 'grep --no-index prefers paths to revs' ' @@ -1045,7 +1045,7 @@ test_expect_success 'grep --no-index prefers paths to revs' ' test_expect_success 'grep --no-index does not "diagnose" revs' ' test_must_fail git grep --no-index o :1:hello.c 2>err && - test_i18ngrep ! -i "did you mean" err + ! grep -i "did you mean" err ' cat >expected <out 2>msg && - test_i18ngrep open-files-in-pager msg + grep open-files-in-pager msg ' test_expect_success 'git grep -O --no-index' ' diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh index 5b6eb3a65e..3b69c57602 100755 --- a/t/t7814-grep-recurse-submodules.sh +++ b/t/t7814-grep-recurse-submodules.sh @@ -306,7 +306,7 @@ test_incompatible_with_recurse_submodules () { test_expect_success "--recurse-submodules and $1 are incompatible" " test_must_fail git grep -e. --recurse-submodules $1 2>actual && - test_i18ngrep 'not supported with --recurse-submodules' actual + grep 'not supported with --recurse-submodules' actual " } diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 661f9d430d..e48370dfa0 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -212,12 +212,12 @@ EOF test_expect_success 'blame -L with invalid start' ' test_must_fail git blame -L5 tres 2>errors && - test_i18ngrep "has only 2 lines" errors + grep "has only 2 lines" errors ' test_expect_success 'blame -L with invalid end' ' test_must_fail git blame -L1,5 tres 2>errors && - test_i18ngrep "has only 2 lines" errors + grep "has only 2 lines" errors ' test_expect_success 'blame parses part of -L' ' diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 60a80f60b2..3c443bcea8 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -336,7 +336,7 @@ test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email' --smtp-server="$(pwd)/fake.sendmail" \ --to=to@example.com \ $patches errors && - test_i18ngrep "tell me who you are" errors + grep "tell me who you are" errors ) ' diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 2e0ba3ebd8..5039c5e2f0 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2785,7 +2785,7 @@ test_expect_success 'S: filemodify with garbage after mark must fail' ' M 100644 :403x hello.c EOF cat err && - test_i18ngrep "space after mark" err + grep "space after mark" err ' # inline is misspelled; fast-import thinks it is some unknown dataref @@ -2802,7 +2802,7 @@ test_expect_success 'S: filemodify with garbage after inline must fail' ' BLOB EOF cat err && - test_i18ngrep "nvalid dataref" err + grep "nvalid dataref" err ' test_expect_success 'S: filemodify with garbage after sha1 must fail' ' @@ -2816,7 +2816,7 @@ test_expect_success 'S: filemodify with garbage after sha1 must fail' ' M 100644 ${sha1}x hello.c EOF cat err && - test_i18ngrep "space after SHA1" err + grep "space after SHA1" err ' # @@ -2832,7 +2832,7 @@ test_expect_success 'S: notemodify with garabge after mark dataref must fail' ' N :202x :302 EOF cat err && - test_i18ngrep "space after mark" err + grep "space after mark" err ' test_expect_success 'S: notemodify with garbage after inline dataref must fail' ' @@ -2848,7 +2848,7 @@ test_expect_success 'S: notemodify with garbage after inline dataref must fail' BLOB EOF cat err && - test_i18ngrep "nvalid dataref" err + grep "nvalid dataref" err ' test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' ' @@ -2862,7 +2862,7 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' ' N ${sha1}x :302 EOF cat err && - test_i18ngrep "space after SHA1" err + grep "space after SHA1" err ' # @@ -2878,7 +2878,7 @@ test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' N :202 :302x EOF cat err && - test_i18ngrep "after mark" err + grep "after mark" err ' # @@ -2912,7 +2912,7 @@ test_expect_success 'S: from with garbage after mark must fail' ' # now evaluate the error cat err && - test_i18ngrep "after mark" err + grep "after mark" err ' @@ -2932,7 +2932,7 @@ test_expect_success 'S: merge with garbage after mark must fail' ' M 100644 :403 hello.c EOF cat err && - test_i18ngrep "after mark" err + grep "after mark" err ' # @@ -2948,7 +2948,7 @@ test_expect_success 'S: tag with garbage after mark must fail' ' TAG EOF cat err && - test_i18ngrep "after mark" err + grep "after mark" err ' # @@ -2959,7 +2959,7 @@ test_expect_success 'S: cat-blob with garbage after mark must fail' ' cat-blob :403x EOF cat err && - test_i18ngrep "after mark" err + grep "after mark" err ' # @@ -2970,7 +2970,7 @@ test_expect_success 'S: ls with garbage after mark must fail' ' ls :302x hello.c EOF cat err && - test_i18ngrep "space after mark" err + grep "space after mark" err ' test_expect_success 'S: ls with garbage after sha1 must fail' ' @@ -2979,7 +2979,7 @@ test_expect_success 'S: ls with garbage after sha1 must fail' ' ls ${sha1}x hello.c EOF cat err && - test_i18ngrep "space after tree-ish" err + grep "space after tree-ish" err ' ### diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 4849edc4ef..7709eae64d 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -51,7 +51,7 @@ test_expect_success 'git p4 sync uninitialized repo' ' ( cd "$git" && test_must_fail git p4 sync 2>errs && - test_i18ngrep "Perhaps you never did" errs + grep "Perhaps you never did" errs ) ' @@ -203,7 +203,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' ' test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1 ) && cat errs && - test_i18ngrep ! Traceback errs + ! grep Traceback errs ' # Hide a file from p4d, make sure we catch its complaint. This won't fail in @@ -214,7 +214,7 @@ test_expect_success 'exit gracefully for p4 server errors' ' mv "$db"/depot/file1,v "$db"/depot/file1,v,hidden && test_when_finished cleanup_git && test_expect_code 1 git p4 clone --dest="$git" //depot@1 >out 2>err && - test_i18ngrep "Error from p4 print" err + grep "Error from p4 print" err ' test_expect_success 'clone --bare should make a bare repository' ' diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 3457d5db64..337efa437d 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -72,7 +72,7 @@ test_expect_success 'submit --dry-run' ' test_commit "dry-run1" && test_commit "dry-run2" && git p4 submit --dry-run >out && - test_i18ngrep "Would apply" out + grep "Would apply" out ) && ( cd "$cli" && @@ -96,7 +96,7 @@ test_expect_success 'submit --dry-run --export-labels' ' git commit -m "dry-run2" dry-run2 && git tag -m "dry-run-tag1" dry-run-tag1 HEAD^ && git p4 submit --dry-run --export-labels >out && - test_i18ngrep "Would create p4 label" out + grep "Would create p4 label" out ) && ( cd "$cli" && @@ -400,7 +400,7 @@ test_expect_success 'description with Jobs section and bogus following text' ' # build a job make_job $(cat jobname) && test_must_fail git p4 submit 2>err && - test_i18ngrep "Unknown field name" err + grep "Unknown field name" err ) && ( cd "$cli" && @@ -418,9 +418,9 @@ test_expect_success 'submit --prepare-p4-only' ' git add prep-only-add && git commit -m "prep only add" && git p4 submit --prepare-p4-only >out && - test_i18ngrep "prepared for submission" out && - test_i18ngrep "must be deleted" out && - test_i18ngrep ! "everything below this line is just the diff" out + grep "prepared for submission" out && + grep "must be deleted" out && + ! grep "everything below this line is just the diff" out ) && ( cd "$cli" && diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh index 37b42d03a2..49a59e7e1b 100755 --- a/t/t9815-git-p4-submit-fail.sh +++ b/t/t9815-git-p4-submit-fail.sh @@ -35,7 +35,7 @@ test_expect_success 'conflict on one commit' ' git add file1 && git commit -m "line3 in file1 will conflict" && test_expect_code 1 git p4 submit >out && - test_i18ngrep "No commits applied" out + grep "No commits applied" out ) ' @@ -58,7 +58,7 @@ test_expect_success 'conflict on second of two commits' ' git add file1 && git commit -m "line4 in file1 will conflict" && test_expect_code 1 git p4 submit >out && - test_i18ngrep "Applied only the commits" out + grep "Applied only the commits" out ) ' @@ -81,7 +81,7 @@ test_expect_success 'conflict on first of two commits, skip' ' # but this commit is okay test_commit "okay_commit_after_skip" && echo s | test_expect_code 1 git p4 submit >out && - test_i18ngrep "Applied only the commits" out + grep "Applied only the commits" out ) ' @@ -104,7 +104,7 @@ test_expect_success 'conflict on first of two commits, quit' ' # but this commit is okay test_commit "okay_commit_after_quit" && echo q | test_expect_code 1 git p4 submit >out && - test_i18ngrep "No commits applied" out + grep "No commits applied" out ) ' @@ -144,7 +144,7 @@ test_expect_success 'conflict on first of two commits, --conflict=skip' ' # but this commit is okay test_commit "okay_commit_after_auto_skip" && test_expect_code 1 git p4 submit --conflict=skip >out && - test_i18ngrep "Applied only the commits" out + grep "Applied only the commits" out ) ' @@ -167,7 +167,7 @@ test_expect_success 'conflict on first of two commits, --conflict=quit' ' # but this commit is okay test_commit "okay_commit_after_auto_quit" && test_expect_code 1 git p4 submit --conflict=quit >out && - test_i18ngrep "No commits applied" out + grep "No commits applied" out ) ' diff --git a/t/test-lib.sh b/t/test-lib.sh index 13b5696822..3b9e5a0669 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1013,42 +1013,6 @@ test -z "$NO_PYTHON" && test_set_prereq PYTHON test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE test -z "$NO_GETTEXT" && test_set_prereq GETTEXT -# Can we rely on git's output in the C locale? -if test -n "$GETTEXT_POISON" -then - GIT_GETTEXT_POISON=YesPlease - export GIT_GETTEXT_POISON - test_set_prereq GETTEXT_POISON -else - test_set_prereq C_LOCALE_OUTPUT -fi - -# Use this instead of test_cmp to compare files that contain expected and -# actual output from git commands that can be translated. When running -# under GETTEXT_POISON this pretends that the command produced expected -# results. -test_i18ncmp () { - test -n "$GETTEXT_POISON" || test_cmp "$@" -} - -# Use this instead of "grep expected-string actual" to see if the -# output from a git command that can be translated either contains an -# expected string, or does not contain an unwanted one. When running -# under GETTEXT_POISON this pretends that the command produced expected -# results. -test_i18ngrep () { - if test -n "$GETTEXT_POISON" - then - : # pretend success - elif test "x!" = "x$1" - then - shift - ! grep "$@" - else - grep "$@" - fi -} - test_lazy_prereq PIPE ' # test whether the filesystem supports FIFOs case $(uname -s) in -- 2.11.0