From f20f8ab371ad2cd8d49a9eddad1c967aed81572c Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Tue, 29 Mar 2016 14:09:25 +0200
Subject: simplify using git interpret-trailer's new --in-place option

---
 README.md    | 2 +-
 git-merge-pr | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f4e07f9..626b1eb 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Useful `git am` flags:
 
 ## Requirements
 
-* Git 2.2.0 or newer
+* Git 2.8.0 or newer
 * wget
 * jq (only for listing pull requests)
 
diff --git a/git-merge-pr b/git-merge-pr
index 464f5f6..e6f0e5d 100755
--- a/git-merge-pr
+++ b/git-merge-pr
@@ -37,7 +37,6 @@ if [ "$(git config --bool --get merge-pr.autoclose)" = false ]; then
 fi
 
 # Rewrite last commit message to close GitHub issue.
-GIT_EDITOR='sh -c '\''git -c trailer.closes.ifExists=replace interpret-trailers \
-		--trailer "Closes: #'"$PR"' [via git-merge-pr]" "$1" > "$1-" &&
-	mv "$1-" "$1"'\'' -' \
+GIT_EDITOR="git -c trailer.closes.ifExists=replace interpret-trailers \
+	--trailer 'Closes: #$PR [via git-merge-pr]' --in-place" \
 git commit --quiet --amend
-- 
cgit 1.4.1