From ad241d9861131ab47620955bfb9292c4d4f71f3c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 Jul 2012 16:06:27 -0700 Subject: [PATCH] Meta/Reintegrate: force invoking the editor when merging As "git merge" is clever not to default to --edit behaviour when its standard input and output streams are not connected to the same terminal (i.e. indicating an interactive tty session), we would need to explicitly ask for "--edit" while exporting "EDITOR=:" one-shot, so that commit log cleaner still is triggered. In the longer term, the interactions among pull, fmt-merge-msg, merge and the editor need to be redesigned, but it is a large task, so for now this workaround should suffice. --- Reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reintegrate b/Reintegrate index 419e9127d9..92f3d278b8 100755 --- a/Reintegrate +++ b/Reintegrate @@ -100,7 +100,7 @@ no) mb=$(git merge-base "$tip" "$save") test "$mb" = "$tip" && continue - EDITOR=: git merge $accept_rerere "$branch" || + EDITOR=: git merge $accept_rerere --edit "$branch" || accept_rerere || exit -- 2.47.3