add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
Use the new "git var GIT_EDITOR" feature to decide what editor to use, instead of duplicating its logic elsewhere. This should make the behavior of commands in edge cases (e.g., editor names with spaces) a little more consistent. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
6361824589
commit
b4479f0747
@ -99,19 +99,12 @@ set_reflog_action() {
|
||||
}
|
||||
|
||||
git_editor() {
|
||||
: "${GIT_EDITOR:=$(git config core.editor)}"
|
||||
: "${GIT_EDITOR:=${VISUAL:-${EDITOR}}}"
|
||||
case "$GIT_EDITOR,$TERM" in
|
||||
,dumb)
|
||||
echo >&2 "No editor specified in GIT_EDITOR, core.editor, VISUAL,"
|
||||
echo >&2 "or EDITOR. Tried to fall back to vi but terminal is dumb."
|
||||
echo >&2 "Please set one of these variables to an appropriate"
|
||||
echo >&2 "editor or run $0 with options that will not cause an"
|
||||
echo >&2 "editor to be invoked (e.g., -m or -F for git-commit)."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
eval "${GIT_EDITOR:=vi}" '"$@"'
|
||||
if test -z "${GIT_EDITOR:+set}"
|
||||
then
|
||||
GIT_EDITOR="$(git var GIT_EDITOR)" || return $?
|
||||
fi
|
||||
|
||||
eval "$GIT_EDITOR" '"$@"'
|
||||
}
|
||||
|
||||
is_bare_repository () {
|
||||
|
||||
Reference in New Issue
Block a user