Meta/Reintegrate: need to override GIT_EDITOR

The user may have his own GIT_EDITOR and overriding EDITOR would
not help making the script non-interactive.

diff --git a/Reintegrate b/Reintegrate
index 48a698f9dee842d550ee56b08d6f6f2fc06bc0c4..8dee292051eb08bb01059b3913995d5aa3d25aaf 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -116,7 +116,7 @@ no)
                        git rerere remaining
                        return 1
                else
-                       EDITOR=: git commit --no-verify
+                       GIT_EDITOR=: git commit --no-verify
                        echo "Accepted previous resolution"
                        return 0
                fi
@@ -170,7 +170,7 @@ no)
 
                        rebuild=$(git config "branch.$branch.rebuild" || :)
 
-                       EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
+                       GIT_EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
                        accept_rerere ||
                        exit
 
@@ -187,7 +187,7 @@ no)
                                echo >&2 "Fixing up the merge"
                                git cherry-pick --no-commit "refs/merge-fix/$branch" &&
                                git diff --stat HEAD &&
-                               EDITOR=: git commit --amend -a || exit
+                               GIT_EDITOR=: git commit --amend -a || exit
                        fi
                        ;;
                pick" "*)