summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-20 06:52:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-23 04:43:19 (GMT)
commitbc7ccfd2d7342bf81d344c4215a17ebbb64d9212 (patch)
tree36ee2b91a3c3a2f68ba4f4c2b8e2a3ebeda3d51f
parentb163512d4eb36ee946908b682c7863658c5a8db4 (diff)
downloadgit-bc7ccfd2d7342bf81d344c4215a17ebbb64d9212.zip
git-bc7ccfd2d7342bf81d344c4215a17ebbb64d9212.tar.gz
git-bc7ccfd2d7342bf81d344c4215a17ebbb64d9212.tar.bz2
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)
-rwxr-xr-xgit-clone.sh3
-rwxr-xr-xgit-fetch.sh5
2 files changed, 5 insertions, 3 deletions
diff --git a/git-clone.sh b/git-clone.sh
index bfb8fd6..44135f4 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 72f17ab..822b4cd 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" |