Unverified Commit aada31ae authored by Mislav Marohnić's avatar Mislav Marohnić Committed by GitHub
Browse files

Avoiding excessive cd when fetching git repos (#2273)

parent 7a741cfb

bin/ruby-build

+17 −27
Original line number Diff line number Diff line
@@ -494,38 +494,28 @@ fetch_git() { 


  echo "Cloning ${git_url}..." >&2



  if type git &>/dev/null; then

  if ! type git &>/dev/null; then

    echo "error: please install \`git\` and try again" >&2

    exit 1

  fi



  if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then

      # shellcheck disable=SC2164

      pushd "$RUBY_BUILD_CACHE_PATH" >&4

      local clone_name

      clone_name="$(sanitize "$git_url")"

      if [ -e "$clone_name" ]; then

        { # shellcheck disable=SC2164

          cd "$clone_name"

          git fetch --force "$git_url" "+${git_ref}:${git_ref}"

        } >&4 2>&1

    local cache_dir

    cache_dir="$RUBY_BUILD_CACHE_PATH/$(sanitize "$git_url")"

    if [ -e "$cache_dir" ]; then

      git -C "$cache_dir" fetch --force "$git_url" "+${git_ref}:${git_ref}" >&4 2>&1

    else

        git clone --bare --branch "$git_ref" "$git_url" "${clone_name}" >&4 2>&1

      git clone --bare --branch "$git_ref" "$git_url" "$cache_dir" >&4 2>&1

    fi

      git_url="$RUBY_BUILD_CACHE_PATH/${clone_name}"

      # shellcheck disable=SC2164

      popd >&4

    git_url="$cache_dir"

  fi



  if [ -e "${package_name}" ]; then

      ( # shellcheck disable=SC2164

        cd "${package_name}"

        git fetch --depth 1 origin "+${git_ref}"

        git checkout -q -B "$git_ref" "origin/${git_ref}"

      ) >&4 2>&1

    git -C "$package_name" fetch --depth 1 origin "+${git_ref}" >&4 2>&1

    git -C "$package_name" checkout -q -B "$git_ref" "origin/${git_ref}" >&4 2>&1

  else

    git clone --depth 1 --branch "$git_ref" "$git_url" "${package_name}" >&4 2>&1

  fi

  else

    echo "error: please install \`git\` and try again" >&2

    exit 1

  fi

}



build_package() {

test/fetch.bats

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ OUT 
@test "updating existing git repository" {

  mkdir -p "${RUBY_BUILD_BUILD_PATH}/package-dev"

  stub git \

    "fetch --depth 1 origin +master : true" \

    "checkout -q -B master origin/master : true"

    "-C package-dev fetch --depth 1 origin +master : true" \

    "-C package-dev checkout -q -B master origin/master : true"



  run_inline_definition <<DEF

install_git "package-dev" "http://example.com/packages/package.git" master copy