From 3c7990e851daebbf70fd0687174ece5a1e250bc0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Sep 2017 18:58:31 +0200
Subject: fix git-config with set -e

---
 git-merge-pr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-merge-pr b/git-merge-pr
index 4c21751..cffde3a 100755
--- a/git-merge-pr
+++ b/git-merge-pr
@@ -30,7 +30,7 @@ fi
 PATCH="$(mktemp)"
 trap "rm -f $PATCH" INT TERM EXIT
 wget -nv -O "$PATCH" https://github.com/$PROJECT/pull/"$PR".patch
-WHITESPACE="$(git config --get merge-pr.whitespace)"
+WHITESPACE="$(git config --get merge-pr.whitespace || true)"
 git am "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH"
 
 if [ "$(git config --bool --get merge-pr.autoclose)" = false ]; then
-- 
cgit 1.4.1