diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-13 19:05:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-13 19:05:38 -0700 |
| commit | dfdcb558ecf93c0e09b8dab89cff4839e8c95e36 (patch) | |
| tree | ae8d1dcb7bcf60a633c53a8ea1e1145f8ec60e67 | |
| parent | Shell utilities: Guard against expr' magic tokens. (diff) | |
| download | tgif-dfdcb558ecf93c0e09b8dab89cff4839e8c95e36.tar.xz | |
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-x | git-fetch.sh | 4 | ||||
| -rwxr-xr-x | git-parse-remote.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 711650f3bc..83143f82cf 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 65c66d5d74..c9b899e3d7 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 |