From: Ondrej Mosnacek omosnace@redhat.com
spec: prevent git apply from searching for the .git directory
By default, git tries to find the repository root by looking for the nearest parent directory containing a .git subdirectory. If the unpacked tarball doesn't include the .git directory, it can lead to git trying to apply the patch to the nearest parent git repository (e.g. the kernel dist-git in case of a local `fedpkg prep`) instead of the current directory.
Thus, pass `--work-tree=.` to `git apply`, so that it doesn't search for the .git directory outside the current directory.
Signed-off-by: Ondrej Mosnacek omosnace@redhat.com
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1392,7 +1392,7 @@ if [ "%{patches}" != "%%{patches}" ] ; then done fi 2>/dev/null
-patch_command='git apply' +patch_command='git --work-tree=. apply' ApplyPatch() { local patch=$1
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2107
kernel@lists.fedoraproject.org