about summary refs log tree commit diff
path: root/git-merge-pr
diff options
context:
space:
mode:
authorChristian Neukirchen <chneukirchen@gmail.com>2016-03-29 14:09:25 +0200
committerChristian Neukirchen <chneukirchen@gmail.com>2016-03-29 14:09:25 +0200
commitf20f8ab371ad2cd8d49a9eddad1c967aed81572c (patch)
treecc3a71371395ccde8005ee72ea88ebfb17b9196d /git-merge-pr
parent04d01064e5e9051b756b20e87769208dda58e9d7 (diff)
downloadgit-merge-pr-f20f8ab371ad2cd8d49a9eddad1c967aed81572c.tar.gz
git-merge-pr-f20f8ab371ad2cd8d49a9eddad1c967aed81572c.tar.xz
git-merge-pr-f20f8ab371ad2cd8d49a9eddad1c967aed81572c.zip
simplify using git interpret-trailer's new --in-place option
Diffstat (limited to 'git-merge-pr')
-rwxr-xr-xgit-merge-pr5
1 files changed, 2 insertions, 3 deletions
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