From 98970a597c30323a2d68622a426c5bcd4317ae9b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 20 Mar 2023 00:50:20 -0400 Subject: [PATCH] chore: drop code supporting git versions without worktree support This was necessary on Ubuntu 14.04 (and maybe 16.04) due to using a version of Dokku older than #2699, so we can safely drop the support here as we haven't supported either in a few years. --- plugins/git/internal-functions | 39 ---------------------------------- 1 file changed, 39 deletions(-) diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions index 6af15af18..f54d10ff0 100755 --- a/plugins/git/internal-functions +++ b/plugins/git/internal-functions @@ -511,11 +511,6 @@ fn-git-setup-build-dir() { declare APP="$1" GIT_WORKDIR="$2" REV="$3" local DOKKU_KEEP_GIT_DIR="$(fn-plugin-property-get "git" "$APP" "keep-git-dir" "")" - if ! fn-git-use-worktree; then - fn-git-setup-build-dir-old "$APP" "$GIT_WORKDIR" "$REV" - return - fi - if [[ "$DOKKU_KEEP_GIT_DIR" == "true" ]]; then fn-git-setup-build-dir-new "$APP" "$GIT_WORKDIR" "$REV" else @@ -546,23 +541,6 @@ fn-git-setup-build-dir-new() { fn-git-setup-build-dir-submodules "$APP" "$GIT_WORKDIR" } -fn-git-setup-build-dir-old() { - declare APP="$1" GIT_WORKDIR="$2" REV="$3" - local APP_ROOT="$DOKKU_ROOT/$APP" - local TMP_TAG="dokku/$REV" - - suppress_output fn-git-cmd "$APP_ROOT" tag -d "$TMP_TAG" &>/dev/null || true - suppress_output fn-git-cmd "$APP_ROOT" tag "$TMP_TAG" "$REV" - suppress_output fn-git-cmd "$GIT_WORKDIR" init - suppress_output fn-git-cmd "$GIT_WORKDIR" config advice.detachedHead false - suppress_output fn-git-cmd "$GIT_WORKDIR" remote add origin "$DOKKU_ROOT/$APP" - suppress_output fn-git-cmd "$GIT_WORKDIR" fetch --depth=1 origin "refs/tags/$TMP_TAG" - suppress_output fn-git-cmd "$GIT_WORKDIR" reset --hard FETCH_HEAD - suppress_output fn-git-cmd "$APP_ROOT" tag -d "$TMP_TAG" &>/dev/null || true - - fn-git-setup-build-dir-submodules "$APP" "$GIT_WORKDIR" -} - fn-git-setup-build-dir-worktree() { declare APP="$1" GIT_WORKDIR="$2" REV="$3" local APP_ROOT="$DOKKU_ROOT/$APP" @@ -599,20 +577,3 @@ fn-git-source-image() { fn-plugin-property-get "git" "$APP" "source-image" "" } - -fn-git-use-worktree() { - declare desc="detects whether to use git worktree" - local GIT_VERSION MAJOR_VERSION MINOR_VERSION - - GIT_VERSION=$(git --version | awk '{split($0,a," "); print a[3]}') - MAJOR_VERSION=$(echo "$GIT_VERSION" | awk '{split($0,a,"."); print a[1]}') - MINOR_VERSION=$(echo "$GIT_VERSION" | awk '{split($0,a,"."); print a[2]}') - - if [[ "$MAJOR_VERSION" -ge "3" ]]; then - return 0 - elif [[ "$MAJOR_VERSION" -eq "2" ]] && [[ "$MINOR_VERSION" -ge "11" ]]; then - return 0 - else - return 1 - fi -}