From 76e1cb1bf1ee78d81062a57e4ffd0c08514d07e8 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 20 May 2024 10:15:33 +1000 Subject: [PATCH] Revert "Prepare git src with `git worktree`" This causes issues when repeatedly building a package using the same git checkout. There is also ambiguity of the default checkout when trying to build from HEAD. See #142 and #143. This reverts commit 85c421f1cb7beb7631a7d972edd8df940c23d1cd. --- scripts/libmakepkg/source/git.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index e8051760..dbe844a0 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -100,7 +100,7 @@ extract_git() { exit 1 fi cd_safe "$srcdir" - elif ! git -C "$dir" worktree add --force "${srcdir}/${dir##*/}"; then + elif ! git clone --origin=origin -s "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plainerr "$(gettext "Aborting...")" exit 1