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>
Junio C Hamano committed
Apr 13, 2006 at 19:05 UTC
dfdcb558ecf93c0e09b8dab89cff4839e8c95e36
2 files changed
+3
-3
git-fetch.sh
+2
-2
@@ -252,10 +252,10 @@ fetch_main () {
252
else
253
not_for_merge=
254
fi
255
- if expr "z$ref" : 'z\+' >/dev/null
255
+ if expr "z$ref" : 'z+' >/dev/null
256
then
257
single_force=t
258
- ref=$(expr "z$ref" : 'z\+\(.*\)')
258
+ ref=$(expr "z$ref" : 'z+\(.*\)')
259
else
260
single_force=
261
fi
git-parse-remote.sh
+1
-1
@@ -77,7 +77,7 @@ canon_refs_list_for_fetch () {
77
force=
78
case "$ref" in
79
+*)
80
- ref=$(expr "z$ref" : 'z\+\(.*\)')
80
+ ref=$(expr "z$ref" : 'z+\(.*\)')
81
force=+
82
;;
83
esac