diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-23 11:19:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-23 15:32:54 -0700 |
| commit | c1cebcf4314a8f18ec06e6d10ce39f49a59076ec (patch) | |
| tree | 8ed99a6f3cd18030d510aec840506506f76ce399 /t/t3032-merge-recursive-options.sh | |
| parent | bed137d2d55a3b5cbd642b1e80cd7bd9094db8d4 (diff) | |
| download | git-c1cebcf4314a8f18ec06e6d10ce39f49a59076ec.tar.gz git-c1cebcf4314a8f18ec06e6d10ce39f49a59076ec.tar.xz | |
scripts: more "export VAR=VALUE" fixes
Found by
git grep '[^-]export [^&]*=' -- \*.sh
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 6 |
1 files changed, 5 insertions, 1 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 () { |