From: Junio C Hamano <junkio@cox.net>
Date: Tue, 20 Sep 2005 06:52:33 +0000 (-0700)
Subject: Do not give alarming error message from rsync in fetch and clone.
X-Git-Tag: v0.99.7b~1^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc7ccfd2d7342bf81d344c4215a17ebbb64d9212;p=git.git

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 bfb8fd628..44135f489 100755
--- 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.
-		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
diff --git a/git-fetch.sh b/git-fetch.sh
index 72f17ab6c..822b4cd98 100755
--- 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" |