summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-13 11:36:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-13 11:36:36 -0700
commit69ae92bda13dfbf0b7d169c57b9f2715af2a9d67 (patch)
tree660bdace0e4f761033c60cf230bb49ff00fc5eea /git-am.sh
parentbc979945305b87caf1e5975d30d42bafd88ad846 (diff)
downloadgit-69ae92bda13dfbf0b7d169c57b9f2715af2a9d67.tar.gz
shell portability: no "export VAR=VAL"
It is more portable to say "VAR=VAL && export VAR" instead. Noticed by Ævar. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index e7f008c7ba..5f249485df 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -137,7 +137,7 @@ It does not apply to blobs recorded in its index."
export GITHEAD_$his_tree
if test -n "$GIT_QUIET"
then
- export GIT_MERGE_VERBOSITY=0
+ GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
fi
git-merge-recursive $orig_tree -- HEAD $his_tree || {
git rerere $allow_rerere_autoupdate