From: Stefan Naewe <stefan.naewe@gmail.com>
Date: Thu, 15 Aug 2013 17:32:57 +0000 (+0200)
Subject: merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet
X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/9c1c7680d4827fa55092f78646d43de3ed1a1ab3

merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet

Somehow git rebase -i seems to ignore GIT_EDITOR and only uses
GIT_SEQUENCE_EDITOR. Set both variables to not introduce a regression.

Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
---

diff --git a/share/msysGit/merging-rebase.sh b/share/msysGit/merging-rebase.sh
index f17ac5d9..44ba7177 100755
--- a/share/msysGit/merging-rebase.sh
+++ b/share/msysGit/merging-rebase.sh
@@ -180,4 +180,4 @@ EOF
 chmod a+x "$TMP_EDITOR"
 
 # Rebase!
-GIT_EDITOR="$TMP_EDITOR" git rebase --autosquash -i ${REBASING_BASE:-$TO}
+GIT_EDITOR="$TMP_EDITOR" GIT_SEQUENCE_EDITOR="$TMP_EDITOR" git rebase --autosquash -i ${REBASING_BASE:-$TO}