[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.20-72-gd512007
From: |
Jim Meyering |
Subject: |
grep branch, master, updated. v2.20-72-gd512007 |
Date: |
Wed, 29 Oct 2014 17:47:06 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via d512007830d2c7b961269ae18503f4c84cbbd79a (commit)
from 834f42b2abe6d25273ff70cf83e9ff88d028a882 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d512007830d2c7b961269ae18503f4c84cbbd79a
commit d512007830d2c7b961269ae18503f4c84cbbd79a
Author: Jim Meyering <address@hidden>
Date: Tue Oct 28 21:02:00 2014 -0700
gnulib: update to latest; bootstrap, too
* gnulib: Update to latest.
* bootstrap: Copy latest from gnulib.
diff --git a/bootstrap b/bootstrap
index ce90bc4..4f0493a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -210,7 +210,17 @@ bootstrap_sync=false
use_git=true
check_exists() {
- ($1 --version </dev/null) >/dev/null 2>&1
+ if test "$1" = "--verbose"; then
+ ($2 --version </dev/null) >/dev/null 2>&1
+ if test $? -ge 126; then
+ # If not found, run with diagnostics as one may be
+ # presented with env variables to set to find the right version
+ ($2 --version </dev/null)
+ fi
+ else
+ ($1 --version </dev/null) >/dev/null 2>&1
+ fi
+
test $? -lt 126
}
@@ -408,7 +418,7 @@ sort_ver() { # sort -V is not generally available
get_version() {
app=$1
- $app --version >/dev/null 2>&1 || return 1
+ $app --version >/dev/null 2>&1 || { $app --version; return 1; }
$app --version 2>&1 |
sed -n '# Move version to start of line.
@@ -467,7 +477,7 @@ check_versions() {
if [ "$req_ver" = "-" ]; then
# Merely require app to exist; not all prereq apps are well-behaved
# so we have to rely on $? rather than get_version.
- if ! check_exists $app; then
+ if ! check_exists --verbose $app; then
warn_ "Error: '$app' not found"
ret=1
fi
@@ -598,8 +608,8 @@ case ${GNULIB_SRCDIR--} in
# Note that $use_git is necessarily true in this case.
if git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
- git submodule init || exit $?
- git submodule update || exit $?
+ git submodule init -- "$gnulib_path" || exit $?
+ git submodule update -- "$gnulib_path" || exit $?
elif [ ! -d "$gnulib_path" ]; then
echo "$0: getting gnulib files..."
@@ -628,13 +638,14 @@ case ${GNULIB_SRCDIR--} in
# This fallback allows at least git 1.5.5.
if test -f "$gnulib_path"/gnulib-tool; then
# Since file already exists, assume submodule init already complete.
- git submodule update || exit $?
+ git submodule update -- "$gnulib_path" || exit $?
else
# Older git can't clone into an empty directory.
rmdir "$gnulib_path" 2>/dev/null
git clone --reference "$GNULIB_SRCDIR" \
"$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
- && git submodule init && git submodule update \
+ && git submodule init -- "$gnulib_path" \
+ && git submodule update -- "$gnulib_path" \
|| exit $?
fi
fi
diff --git a/gnulib b/gnulib
index d55899f..8415b67 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit d55899fd2c5794ac85ecb14d5e2f646a89e4b4dd
+Subproject commit 8415b6792e53f9aa309caedda799f9d9f3dffc53
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 25 ++++++++++++++++++-------
gnulib | 2 +-
2 files changed, 19 insertions(+), 8 deletions(-)
hooks/post-receive
--
grep
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.20-72-gd512007,
Jim Meyering <=