Do not give alarming error message from rsync in fetch and clone.

When we check the optional objects/info/alternates file at the remote
repository, we forgot to really squelch error message from rsync.

Not having that file is not a crime.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 89d844d084f14bc9506f63cd3c9aa44b21b49067 commit)

diff --git a/git-clone.sh b/git-clone.sh
index bfb8fd628536c5bbb08c9d07c7e93455cd253650..44135f489d55c29eb2e7dce1b892471c55b9914b 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -152,7 +152,8 @@ yes,yes)
                # Look at objects/info/alternates for rsync -- http will
                # support it natively and git native ones will do it on the
                # remote end.  Not having that file is not a crime.
                # Look at objects/info/alternates for rsync -- http will
                # support it natively and git native ones will do it on the
                # remote end.  Not having that file is not a crime.

-               rsync -q "$repo/objects/info/alternates" "$D/.git/TMP_ALT" ||
+               rsync -q "$repo/objects/info/alternates" \
+                       "$D/.git/TMP_ALT" 2>/dev/null ||

                        rm -f "$D/.git/TMP_ALT"
                if test -f "$D/.git/TMP_ALT"
                then
                        rm -f "$D/.git/TMP_ALT"
                if test -f "$D/.git/TMP_ALT"
                then

diff --git a/git-fetch.sh b/git-fetch.sh
index 72f17ab6c9fab567b236e5f2656515df40d98adc..822b4cd982c46feaeed9b94b16973b63a0c567c1 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -193,8 +193,9 @@ do
            # Look at objects/info/alternates for rsync -- http will
            # support it natively and git native ones will do it on the remote
            # end.  Not having that file is not a crime.
            # Look at objects/info/alternates for rsync -- http will
            # support it natively and git native ones will do it on the remote
            # end.  Not having that file is not a crime.

-           rsync -q "$remote/objects/info/alternates" "$GIT_DIR/TMP_ALT" ||
-                   rm -f "$GIT_DIR/TMP_ALT"
+           rsync -q "$remote/objects/info/alternates" \
+               "$GIT_DIR/TMP_ALT" 2>/dev/null ||
+               rm -f "$GIT_DIR/TMP_ALT"

            if test -f "$GIT_DIR/TMP_ALT"
            then
                resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |
            if test -f "$GIT_DIR/TMP_ALT"
            then
                resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |