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
@@ -116,7 +116,7 @@ no)
116
git rerere remaining
117
return 1
118
else
119
- EDITOR=: git commit --no-verify
119
+ GIT_EDITOR=: git commit --no-verify
120
echo "Accepted previous resolution"
121
return 0
122
fi
@@ -170,7 +170,7 @@ no)
170
171
rebuild=$(git config "branch.$branch.rebuild" || :)
172
173
- EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
173
+ GIT_EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
174
accept_rerere ||
175
exit
176
@@ -187,7 +187,7 @@ no)
187
echo >&2 "Fixing up the merge"
188
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
189
git diff --stat HEAD &&
190
- EDITOR=: git commit --amend -a || exit
190
+ GIT_EDITOR=: git commit --amend -a || exit
191
fi
192
;;
193
pick" "*)