undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 89d844d084 commit)
This commit is contained in:
Junio C Hamano 2005-09-19 23:52:33 -07:00
parent b163512d4e
commit bc7ccfd2d7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-clone.sh
View File

@ -152,7 +152,8 @@ yes,yes)
# Look at objects/info/alternates for rsync -- http will # Look at objects/info/alternates for rsync -- http will
# support it natively and git native ones will do it on the # support it natively and git native ones will do it on the
# remote end. Not having that file is not a crime. # 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" rm -f "$D/.git/TMP_ALT"
if test -f "$D/.git/TMP_ALT" if test -f "$D/.git/TMP_ALT"
then then

5
git-fetch.sh
View File

@ -193,8 +193,9 @@ do
# Look at objects/info/alternates for rsync -- http will # Look at objects/info/alternates for rsync -- http will
# support it natively and git native ones will do it on the remote # support it natively and git native ones will do it on the remote
# end. Not having that file is not a crime. # end. Not having that file is not a crime.
rsync -q "$remote/objects/info/alternates" "$GIT_DIR/TMP_ALT" || rsync -q "$remote/objects/info/alternates" \
rm -f "$GIT_DIR/TMP_ALT" "$GIT_DIR/TMP_ALT" 2>/dev/null ||
rm -f "$GIT_DIR/TMP_ALT"
if test -f "$GIT_DIR/TMP_ALT" if test -f "$GIT_DIR/TMP_ALT"
then then
resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" | resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |