diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-19 23:52:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 15:07:54 -0700 |
| commit | 89d844d084f14bc9506f63cd3c9aa44b21b49067 (patch) | |
| tree | 05a4fb47dff443d0ddefc825c843c11b86d32f4c | |
| parent | [PATCH] Return proper error valud from "parse_date()" (diff) | |
| download | tgif-89d844d084f14bc9506f63cd3c9aa44b21b49067.tar.xz | |
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>
| -rwxr-xr-x | git-clone.sh | 3 | ||||
| -rwxr-xr-x | git-fetch.sh | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/git-clone.sh b/git-clone.sh index bfb8fd6285..44135f489d 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 72f17ab6c9..822b4cd982 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" | |