summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorBen Jackson <ben@ben.com>2009-04-18 20:42:07 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-18 21:37:46 -0700
commitea10b60c910e4a23483f47f17becc5e58f07ebe9 (patch)
tree6ea690864253a52b15cf35c1a2a4dd5ee20e9c99 /git-am.sh
parent77b96d6dbf65f736a63b8a0bb5f810edbf895a09 (diff)
downloadgit-ea10b60c910e4a23483f47f17becc5e58f07ebe9.tar.gz
Work around ash "alternate value" expansion bug
Ash (used as /bin/sh on many distros) has a shell expansion bug for the form ${var:+word word}. The result is a single argument "word word". Work around by using ${var:+word} ${var:+word} or equivalent. Signed-off-by: Ben Jackson <ben@ben.com> 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 774383fb68..6d1848b6cc 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -571,7 +571,7 @@ do
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
export GIT_COMMITTER_DATE
fi &&
- git commit-tree $tree ${parent:+-p $parent} <"$dotest/final-commit"
+ git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
) &&
git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
stop_here $this