[PATCH v2] Work around ash "alternate value" expansion bug
- From
Ben Jackson <ben@ben.com>
- Date
- Apr 19, 2009, 03:42 UTC
- Message-ID
- <1240112527-79979-1-git-send-email-ben@ben.com>
- In-Reply-To
- <1240044459-57227-1-git-send-email-ben@ben.com>
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> ---
See http://thread.gmane.org/gmane.comp.version-control.git/116816 for the original notes which describe the problem in more detail.
This version uses a different workaround suggested by Junio for git-submodule which is less likely to be "cleaned up" back to the original problem. Since new the change is more complex I beefed up the new test slightly to ensure we are getting into the right case.
git-am.sh | 2 +- git-submodule.sh | 11 +++++++++-- t/t7400-submodule-basic.sh | 10 ++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh index bfc50c9..e539c60 100755 --- a/git-am.sh +++ b/git-am.sh @@ -570,7 +570,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 diff --git a/git-submodule.sh b/git-submodule.sh index 7c2e060..8e234a4 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -204,8 +204,15 @@ cmd_add() else module_clone "$path" "$realrepo" || exit - (unset GIT_DIR; cd "$path" && git checkout -f -q ${branch:+-b "$branch" "origin/$branch"}) || - die "Unable to checkout submodule '$path'" + ( + unset GIT_DIR + cd "$path" && + # ash fails to wordsplit ${branch:+-b "$branch"...} + case "$branch" in + '') git checkout -f -q ;; + ?*) git checkout -f -q -b "$branch" "origin/$branch" ;; + esac + ) || die "Unable to checkout submodule '$path'" fi git add "$path" || diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index af690ec..0f2ccc6 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -64,6 +64,16 @@ test_expect_success 'submodule add' ' ) ' +test_expect_success 'submodule add --branch' ' + ( + cd addtest && + git submodule add -b initial "$submodurl" submod-branch && + git submodule init && + cd submod-branch && + git branch | grep initial + ) +' + test_expect_success 'submodule add with ./ in path' ' ( cd addtest &&
-- 1.6.0.1