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.
Junio C Hamano committed
Mar 6, 2015 at 15:24 UTC
878a985a8f45ede7654f95d70b41f04e6d09ac11
1 file changed
+3
-3
Reintegrate
+3
-3
index 48a698f9de..8dee292051 100755
--- 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" "*)