Merge 'fixes' branch

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.
-           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" |