зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
2a39064c65
Коммит
89d844d084
|
@ -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
|
||||||
|
|
|
@ -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" |
|
||||||
|
|
Загрузка…
Ссылка в новой задаче