From a936fbebd1d538e65d71b7075b635a761063970f Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 7 Sep 2021 02:04:14 -0700
Subject: Use --keep-non-patch when applying git patches

Some of our patches use bracketed tags.
---
 scripts/fetch-git.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/fetch-git.sh')

diff --git a/scripts/fetch-git.sh b/scripts/fetch-git.sh
index eea32d1c..460df460 100644
--- a/scripts/fetch-git.sh
+++ b/scripts/fetch-git.sh
@@ -9,5 +9,5 @@ cd "$1"
 
 git submodule update --init --checkout src
 if [ -d patch ] ; then
-	git -C src am --whitespace=nowarn "$PWD"/patch/*
+	git -C src am --keep-non-patch --whitespace=nowarn "$PWD"/patch/*
 fi
-- 
cgit v1.2.3