oasis

commit: a936fbebd1d538e65d71b7075b635a761063970f
parent d623cd7d0c3eaf105bd9ec7812db7e26b1aa3e4e
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  7 Sep 2021 02:04:14 -0700

Use --keep-non-patch when applying git patches

Some of our patches use bracketed tags.

Diffstat:
M
scripts/fetch-git.sh
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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