summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-14 02:05:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-14 02:05:38 (GMT)
commitdfdcb558ecf93c0e09b8dab89cff4839e8c95e36 (patch)
treeae8d1dcb7bcf60a633c53a8ea1e1145f8ec60e67
parentf327dbced25a3c6fcc0b84d2d6adffa9343b09f0 (diff)
downloadgit-dfdcb558ecf93c0e09b8dab89cff4839e8c95e36.zip
git-dfdcb558ecf93c0e09b8dab89cff4839e8c95e36.tar.gz
git-dfdcb558ecf93c0e09b8dab89cff4839e8c95e36.tar.bz2
Fix-up previous expr changes.
The regexp on the right hand side of expr : operator somehow was broken. expr 'z+pu:refs/tags/ko-pu' : 'z\+\(.*\)' does not strip '+'; write 'z+\(.*\)' instead. We probably should switch to shell based substring post 1.3.0; that's not bashism but just POSIX anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-fetch.sh4
-rwxr-xr-xgit-parse-remote.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index 711650f..83143f8 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -252,10 +252,10 @@ fetch_main () {
else
not_for_merge=
fi
- if expr "z$ref" : 'z\+' >/dev/null
+ if expr "z$ref" : 'z+' >/dev/null
then
single_force=t
- ref=$(expr "z$ref" : 'z\+\(.*\)')
+ ref=$(expr "z$ref" : 'z+\(.*\)')
else
single_force=
fi
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 65c66d5..c9b899e 100755
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -77,7 +77,7 @@ canon_refs_list_for_fetch () {
force=
case "$ref" in
+*)
- ref=$(expr "z$ref" : 'z\+\(.*\)')
+ ref=$(expr "z$ref" : 'z+\(.*\)')
force=+
;;
esac