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>

diff --git a/git-fetch.sh b/git-fetch.sh
index 711650f3bc49636b43c55e14134cb9f20656f8f9..83143f82cfa3b92a38a9caa2b00860541d139aa2 100755 (executable)
--- 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 65c66d5d7439481cf0ba32c05f1b96def0ad1f86..c9b899e3d73152a92523ed460f4d90fdab3d6f33 100755 (executable)
--- 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