From a07da16e781d2be52a9a35490e1ab705d6f80cdf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 17 Apr 2018 18:48:20 +0200 Subject: [PATCH] download/git: ensure we always work in the expected repository git always look directories up until it finds a repository. In case the git cache is broken, it may no longer be identified as a repository, and git will look higher in the directories until it finds one. In the default conditions, this would be Buildroot's own git tree (because DL_DIR is a subdir of Buildroot), but in some situations may very well be any repository the user has Buildroot in, like a br2-external tree... So, we force git to use our git cache and never look elsewhere, as Suggested by Ricardo. Use GIT_DIR, as it has been there for ages now, while --git-dir was only introduced later (even if most distros ship an later version), as suggested by Arnout. Also fix the one call to git that was not using the wrapper. Reported-by: Ricardo Martincoski Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Cc: Maxime Hadjinlian Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Acked-by: Ricardo Martincoski Tested-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/download/git | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/support/download/git b/support/download/git index 381f3ceeb3..c166ae2813 100755 --- a/support/download/git +++ b/support/download/git @@ -34,25 +34,28 @@ done shift $((OPTIND-1)) # Get rid of our options +# We want to check if a cache of the git clone of this repo already exists. +git_cache="${dl_dir}/git" + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _git() { - eval ${GIT} "${@}" + eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } -# We want to check if a cache of the git clone of this repo already exists. -git_cache="${dl_dir}/git" - # If the cache directory doesn't exists, init a new repo, which will be # fetch'ed later. if [ ! -d "${git_cache}" ]; then + # We can still go through the wrapper, because 'init' does not use + # the path pointed to by GIT_DIR, but really uses the directory + # passed as argument. _git init "'${git_cache}'" fi pushd "${git_cache}" >/dev/null # Ensure the repo has an origin (in case a previous run was killed). -if ! git remote |grep -q -E '^origin$'; then +if ! _git remote |grep -q -E '^origin$'; then _git remote add origin "'${uri}'" fi -- 2.30.2