diff options
| author | Mark Wooding <mdw@distorted.org.uk> | 2006-04-13 22:01:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-13 16:45:48 -0700 |
| commit | f327dbced25a3c6fcc0b84d2d6adffa9343b09f0 (patch) | |
| tree | 9725761748a6282d0be75879546ddf72d98b2501 /git-fetch.sh | |
| parent | 2283645b85dc91ca958b05066511083255a8612a (diff) | |
| download | git-f327dbced25a3c6fcc0b84d2d6adffa9343b09f0.tar.gz | |
Shell utilities: Guard against expr' magic tokens.
Some words, e.g., `match', are special to expr(1), and cause strange
parsing effects. Track down all uses of expr and mangle the arguments
so that this isn't a problem.
Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fetch.sh')
| -rwxr-xr-x | git-fetch.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 954901ddce..711650f3bc 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -112,7 +112,7 @@ append_fetch_head () { *) note_="$remote_name of " ;; esac - remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') && + remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') && remote_="$remote_1_" note_="$note_$remote_" @@ -245,22 +245,22 @@ fetch_main () { # These are relative path from $GIT_DIR, typically starting at refs/ # but may be HEAD - if expr "$ref" : '\.' >/dev/null + if expr "z$ref" : 'z\.' >/dev/null then not_for_merge=t - ref=$(expr "$ref" : '\.\(.*\)') + ref=$(expr "z$ref" : 'z\.\(.*\)') else not_for_merge= fi - if expr "$ref" : '\+' >/dev/null + if expr "z$ref" : 'z\+' >/dev/null then single_force=t - ref=$(expr "$ref" : '\+\(.*\)') + ref=$(expr "z$ref" : 'z\+\(.*\)') else single_force= fi - remote_name=$(expr "$ref" : '\([^:]*\):') - local_name=$(expr "$ref" : '[^:]*:\(.*\)') + remote_name=$(expr "z$ref" : 'z\([^:]*\):') + local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)') rref="$rref$LF$remote_name" @@ -276,7 +276,7 @@ fetch_main () { print "$u"; ' "$remote_name") head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") && - expr "$head" : "$_x40\$" >/dev/null || + expr "z$head" : "z$_x40\$" >/dev/null || die "Failed to fetch $remote_name from $remote" echo >&2 Fetching "$remote_name from $remote" using http git-http-fetch -v -a "$head" "$remote/" || exit @@ -362,7 +362,7 @@ fetch_main () { break ;; esac done - local_name=$(expr "$found" : '[^:]*:\(.*\)') + local_name=$(expr "z$found" : 'z[^:]*:\(.*\)') append_fetch_head "$sha1" "$remote" \ "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" done |