git-rerere: reuse recorded resolve.

diff --git a/git-commit.sh b/git-commit.sh
index 193feeb5e42f1a486a3aae42935cb98696a2baac..9c940837578b6b2925f72838b211cf8928c1baab 100755 (executable)
--- 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
@@ -237,6 +245,7 @@ else
 fi
 ret="$?"
 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
+git-rerere
 
 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
 then