From 577315687ff0b2209ced50974563fb72548bb85e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 May 2018 10:44:10 +0200 Subject: [PATCH] download/git: run all git commands in the current directory That way, we can pushd earlier, which will help with last-ditch recovery in a followup commit. Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Thomas Petazzoni Cc: Ricardo Martincoski Cc: Arnout Vandecappelle Reviewed-by: Ricardo Martincoski Tested-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/download/git | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/support/download/git b/support/download/git index 3b5c8a6cfe..60d6c24f1e 100755 --- a/support/download/git +++ b/support/download/git @@ -34,8 +34,10 @@ 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. +# Create and cd into the directory that will contain the local git cache git_cache="${dl_dir}/git" +mkdir -p "${git_cache}" +pushd "${git_cache}" >/dev/null # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) @@ -70,9 +72,7 @@ _EOF_ # 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}'" - -pushd "${git_cache}" >/dev/null +_git init . # Ensure the repo has an origin (in case a previous run was killed). if ! _git remote |grep -q -E '^origin$'; then -- 2.30.2