support/download: fix the git helper

When switching the git helper over to a shell script, a special case was
not carried over: in case the remote has the required reference, we
attempt a shallow clone, using --depth 1. However, this is not supported
when the remote is accessed with the http protocol.

Therefore, the download fails.

What happened before the conversion to a shell script was that the helper
in the Makefile would fallback to doing a full-clone.

This is the case and behaviour that were lost in the conversion.

To avoid making the script too complex, we only attempt a full clone if
needed. And we decide that a full clone is needed by default; we decide
it is unnecessary if the remote has the needed reference *and* the
shallow clone was successful.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2014-07-07 23:44:33 +02:00 committed by Peter Korsgaard
parent 0fbba2cef2
commit ebe6154ff4

View File

@ -33,10 +33,14 @@ cd "${BUILD_DIR}"
# Remove leftovers from a previous failed run # Remove leftovers from a previous failed run
rm -rf "${repodir}" rm -rf "${repodir}"
git_done=0
if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then
printf "Doing shallow clone\n" printf "Doing shallow clone\n"
${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}" if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}"; then
else git_done=1
fi
fi
if [ ${git_done} -eq 0 ]; then
printf "Doing full clone\n" printf "Doing full clone\n"
${GIT} clone --bare "${repo}" "${repodir}" ${GIT} clone --bare "${repo}" "${repodir}"
fi fi