diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:22:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:22:57 -0700 |
| commit | 63618af24a67e5fc959217201d9f220383a39fd0 (patch) | |
| tree | a6b75c4ebc22e529a11ff462afecfac20ecf713f /t | |
| parent | bba6acb335e296ed692b4aea224b50fd098f693c (diff) | |
| parent | c1cebcf4314a8f18ec06e6d10ce39f49a59076ec (diff) | |
| download | git-63618af24a67e5fc959217201d9f220383a39fd0.tar.gz git-63618af24a67e5fc959217201d9f220383a39fd0.tar.xz | |
Merge branch 'ep/shell-assign-and-export-vars' into maint
* ep/shell-assign-and-export-vars:
scripts: more "export VAR=VALUE" fixes
scripts: "export VAR=VALUE" construct is not portable
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 6 | ||||
| -rwxr-xr-x | 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 5fd7bbb65..4029c9c8c 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 5abd11a56..aa73eeaef 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" | |