summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 07:09:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-30 07:09:36 (GMT)
commita059240f06967f485e0a094e220bae73a746ed24 (patch)
tree25c5314f1192176306f4fe14f2d533d8b4a8ab34
parentbcb477fb60dc3e7c75a0c2870b106afeb21ae5d2 (diff)
parentf5799e05c0e7fbee32ca32995c7c4a627eeff469 (diff)
downloadgit-a059240f06967f485e0a094e220bae73a746ed24.zip
git-a059240f06967f485e0a094e220bae73a746ed24.tar.gz
git-a059240f06967f485e0a094e220bae73a746ed24.tar.bz2
Merge branch 'bc/maint-submodule-fix-parked' into maint
* bc/maint-submodule-fix-parked: git-submodule.sh: separate parens by a space to avoid confusing some shells
-rwxr-xr-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index b010a67..4361ae4 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -491,7 +491,7 @@ cmd_update()
# Run fetch only if $sha1 isn't present or it
# is not reachable from a ref.
(clear_local_git_env; cd "$path" &&
- ((rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
+ ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
test -z "$rev") || git-fetch)) ||
die "Unable to fetch in submodule path '$path'"
fi