зеркало из https://github.com/microsoft/git.git
Use character class for sed expression instead of \s
Sed on Mac OS X doesn't handle \s in a sed expressions so use a more portable character set expression instead. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Родитель
abd66f2207
Коммит
db7fde9cae
|
@ -46,7 +46,7 @@ check_status_options() {
|
||||||
echo "Error from cvs status: $1 $2" >> "${WORKDIR}/marked.log"
|
echo "Error from cvs status: $1 $2" >> "${WORKDIR}/marked.log"
|
||||||
return 1;
|
return 1;
|
||||||
fi
|
fi
|
||||||
got="$(sed -n -e 's/^\s*Sticky Options:\s*//p' "${WORKDIR}/status.out")"
|
got="$(sed -n -e 's/^[ ]*Sticky Options:[ ]*//p' "${WORKDIR}/status.out")"
|
||||||
expect="$3"
|
expect="$3"
|
||||||
if [ x"$expect" = x"" ] ; then
|
if [ x"$expect" = x"" ] ; then
|
||||||
expect="(none)"
|
expect="(none)"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче