diff options
| author | Leah Neukirchen <leah@vuxu.org> | 2017-09-24 18:58:31 +0200 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2017-09-24 18:58:31 +0200 |
| commit | 3c7990e851daebbf70fd0687174ece5a1e250bc0 (patch) | |
| tree | 2f8dcde3cc8bf144568332270587c97bcc9af56d | |
| parent | 18358994a4fe67a0362a2805c5cc9da05316811b (diff) | |
| download | git-merge-pr-3c7990e851daebbf70fd0687174ece5a1e250bc0.tar.gz git-merge-pr-3c7990e851daebbf70fd0687174ece5a1e250bc0.tar.xz git-merge-pr-3c7990e851daebbf70fd0687174ece5a1e250bc0.zip | |
fix git-config with set -e
| -rwxr-xr-x | git-merge-pr | 2 |
1 files changed, 1 insertions, 1 deletions
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 |