diff options
Diffstat (limited to 'git-sh-setup.sh')
| -rwxr-xr-x | git-sh-setup.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index c51985e4c3..8cbd153b62 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -29,7 +29,8 @@ set_reflog_action() { } git_editor() { - GIT_EDITOR=${GIT_EDITOR:-$(git config core.editor || echo ${VISUAL:-${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," @@ -40,7 +41,7 @@ git_editor() { exit 1 ;; esac - "${GIT_EDITOR:-vi}" "$1" + eval "${GIT_EDITOR:=vi}" '"$@"' } is_bare_repository () { @@ -59,8 +60,7 @@ cd_to_toplevel () { } require_work_tree () { - test $(git rev-parse --is-inside-work-tree) = true && - test $(git rev-parse --is-inside-git-dir) = false || + test $(git rev-parse --is-inside-work-tree) = true || die "fatal: $0 cannot be used without a working tree." } |