public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Elia Pinto <gitter.spiros@gmail•com>
Cc: git@vger•kernel.org, tboegi@web•de, dak@gnu•org
Subject: Re: [PATCH v2] Get rid of the non portable shell export VAR=VALUE costruct
Date: Fri, 23 May 2014 11:18:35 -0700	[thread overview]
Message-ID: <xmqqmwe8jr44.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1400840131-966-1-git-send-email-gitter.spiros@gmail.com> (Elia Pinto's message of "Fri, 23 May 2014 03:15:31 -0700")

Elia Pinto <gitter.spiros@gmail•com> writes:

> Found by check-non-portable-shell.pl

Thanks.

Makes me wonder why these two were missed, though.


 t/t3032-merge-recursive-options.sh | 6 +++++-
 t/t5560-http-backend-noserver.sh   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 5fd7bbb..4029c9c 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -14,7 +14,11 @@ test_description='merge-recursive options
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
-test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
+if test_have_prereq GREP_STRIPS_CR
+then
+	GREP_OPTIONS=-U
+	export GREP_OPTIONS
+fi
 
 test_expect_success 'setup' '
 	conflict_hunks () {
diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 9be9ae3..1e25128 100755
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -5,7 +5,11 @@ test_description='test git-http-backend-noserver'
 
 HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
 
-test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
+if test_have_prereq GREP_STRIPS_CR
+then
+	GREP_OPTIONS=-U
+	export GREP_OPTIONS
+fi
 
 run_backend() {
 	echo "$2" |

next prev parent reply	other threads:[~2014-05-23 18:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-23 10:15 [PATCH v2] Get rid of the non portable shell export VAR=VALUE costruct Elia Pinto
2014-05-23 16:18 ` Jonathan Nieder
2014-05-23 18:18 ` Junio C Hamano [this message]
2014-05-23 18:39   ` Junio C Hamano
2014-05-23 18:48     ` Jonathan Nieder
2014-05-23 18:44   ` Jonathan Nieder
2014-05-23 20:40     ` Torsten Bögershausen
2014-05-23 21:25       ` Junio C Hamano
2014-05-23 21:56     ` Junio C Hamano
2014-05-23 20:38 ` Eric Sunshine

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5fd7bbb dfblob:4029c9c dfblob:9be9ae3 dfblob:1e25128 )
 OR (
bs:"Re: [PATCH v2] Get rid of the non portable shell export VAR=VALUE costruct" )
	(help)

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=xmqqmwe8jr44.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=dak@gnu$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitter.spiros@gmail$(echo .)com \
    --cc=tboegi@web$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox