From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH] unset GREP_OPTIONS in test-lib.sh
Date: Wed, 18 Nov 2009 17:15:19 +0100 [thread overview]
Message-ID: <1258560919-28054-1-git-send-email-bert.wesarg@googlemail.com> (raw)
I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this
the test t4252-am-options.sh fails because it calls grep with a .rej file:
grep "@@ -1,3 +1,3 @@" file-2.rej
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
t/test-lib.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index f2ca536..6ac8dc6 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -65,6 +65,8 @@ GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
# CDPATH into the environment
unset CDPATH
+unset GREP_OPTIONS
+
case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
1|2|true)
echo "* warning: Some tests will not work if GIT_TRACE" \
--
tg: (785c58e..) bw/unset-GREP_OPTIONS (depends on: master)
next reply other threads:[~2009-11-18 16:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-18 16:15 Bert Wesarg [this message]
2009-11-18 22:05 ` [PATCH] unset GREP_OPTIONS in test-lib.sh Junio C Hamano
2009-11-22 15:58 ` René Scharfe
2009-11-23 11:22 ` Carlo Marcelo Arenas Belon
2009-11-23 18:27 ` Junio C Hamano
2009-11-23 23:18 ` René Scharfe
2009-11-23 23:29 ` [PATCH] mergetool--lib: simplify guess_merge_tool() René Scharfe
2009-11-27 3:22 ` David Aguilar
2009-11-23 23:52 ` [PATCH] unset GREP_OPTIONS in test-lib.sh Junio C Hamano
2009-11-23 23:59 ` René Scharfe
2009-11-24 0:35 ` Junio C Hamano
2010-03-07 10:30 ` Bert Wesarg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1258560919-28054-1-git-send-email-bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).