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.

diff --git a/Reintegrate b/Reintegrate
index 419e9127d94a31482b3dfaaaebad19d1a50da5c2..92f3d278b8e4a0f385587c8ee9e07c7518725d44 100755 (executable)
--- 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