From 03835b2ede4139a9abd6144d14d842ccbf17cabf Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Sun, 16 Oct 2022 15:48:58 -0500 Subject: [PATCH] fix: git patch when config present --- lib/mini_portile2/mini_portile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mini_portile2/mini_portile.rb b/lib/mini_portile2/mini_portile.rb index f9e448e..60c92f0 100644 --- a/lib/mini_portile2/mini_portile.rb +++ b/lib/mini_portile2/mini_portile.rb @@ -101,7 +101,7 @@ def apply_patch(patch_file) message "Running git apply with #{file}... " # By --work-tree=. git-apply uses the current directory as # the project root and will not search upwards for .git. - execute('patch', ["git", "--git-dir=.", "--work-tree=.", "apply", "--whitespace=warn", file], :initial_message => false) + execute('patch', ["git", "--git-dir=#{tmp_path}", "--work-tree=.", "apply", "--whitespace=warn", file], :initial_message => false) } when which('patch') lambda { |file|