From: Junio C Hamano <junkio@cox.net>
Date: Sun, 5 Feb 2006 06:10:32 +0000 (-0800)
Subject: Do not fall back on vi on dumb terminals.
X-Git-Tag: v1.2.0~64
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7334f06ce6c53e161d1c183a5f93a23992b3c440;p=git.git

Do not fall back on vi on dumb terminals.

When TERM is set to 'dumb', do not start vi to edit the commit log
message.

Suggested by Amos Waterland.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-commit.sh b/git-commit.sh
index 193feeb5e..10946ed5f 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -207,6 +207,14 @@ then
 fi
 case "$no_edit" in
 '')
+	case "${VISUAL:-$EDITOR},$TERM" in
+	,dumb)
+		echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
+		echo >&2 "Please supply the commit log message using either"
+		echo >&2 "-m or -F option.  A boilerplate log message has"
+		echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
+		exit 1 ;;
+	esac
 	${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
 	;;
 esac