From 51ae30614d7e41a2fe85463325b917f8bc9ff289 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Nov 2021 14:51:31 +0100
Subject: use --keep-cr by default

This allows applying patches that change CRLF files.

It is safe here as GitHub's .patch endpoint won't inject CR by accident
(which could happen on a mail transport).
---
 git-merge-pr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-merge-pr b/git-merge-pr
index 6ec6203..992baba 100755
--- a/git-merge-pr
+++ b/git-merge-pr
@@ -42,7 +42,7 @@ PATCH="$(mktemp)"
 trap "rm -f $PATCH" INT TERM EXIT
 $PATCH_CMD "$PATCH" https://github.com/$PROJECT/pull/"$PR".patch
 WHITESPACE="$(git config --get merge-pr.whitespace || true)"
-git am "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH"
+git am --keep-cr "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH"
 
 if [ "$(git config --bool --get merge-pr.autoclose)" = false ]; then
 	exit 0
-- 
cgit 1.4.1