Commit ebe6154f authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 0fbba2ce

support/download/git

+6 −2
Original line number Diff line number Diff line
@@ -33,10 +33,14 @@ cd "${BUILD_DIR}" 
# Remove leftovers from a previous failed run

rm -rf "${repodir}"



git_done=0

if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then

    printf "Doing shallow clone\n"

    ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}"

else

    if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}"; then

        git_done=1

    fi

fi

if [ ${git_done} -eq 0 ]; then

    printf "Doing full clone\n"

    ${GIT} clone --bare "${repo}" "${repodir}"

fi