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>maint
parent
f327dbced2
commit
dfdcb558ec
|
@ -252,10 +252,10 @@ fetch_main () {
|
||||||
else
|
else
|
||||||
not_for_merge=
|
not_for_merge=
|
||||||
fi
|
fi
|
||||||
if expr "z$ref" : 'z\+' >/dev/null
|
if expr "z$ref" : 'z+' >/dev/null
|
||||||
then
|
then
|
||||||
single_force=t
|
single_force=t
|
||||||
ref=$(expr "z$ref" : 'z\+\(.*\)')
|
ref=$(expr "z$ref" : 'z+\(.*\)')
|
||||||
else
|
else
|
||||||
single_force=
|
single_force=
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -77,7 +77,7 @@ canon_refs_list_for_fetch () {
|
||||||
force=
|
force=
|
||||||
case "$ref" in
|
case "$ref" in
|
||||||
+*)
|
+*)
|
||||||
ref=$(expr "z$ref" : 'z\+\(.*\)')
|
ref=$(expr "z$ref" : 'z+\(.*\)')
|
||||||
force=+
|
force=+
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in New Issue