aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-23 16:56:55 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-23 17:19:37 -0800
commitb7884981f8f2a063f577df12c65e9af8b1a4f1b8 (patch)
tree10227b43e837a38d95d472a0b7c400749fbd46e9
parent30c7bb249e9b2038dd05271e055d347f84336576 (diff)
downloadgit-b7884981f8f2a063f577df12c65e9af8b1a4f1b8.tar.gz
git-b7884981f8f2a063f577df12c65e9af8b1a4f1b8.tar.xz
git-revert: make --edit default.
Revert always should explain why, so make --edit the default, unless stdin is not a terminal. If you really don't want to say anything, you can say "git-revert --no-edit $commit", or if you are really sick, you could also say "git-revert $commit </dev/null". But please don't. You can also say "git-cherry-pick --edit $commit". Not editting the commit log message is the default for cherry-pick. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-revert.sh18
1 files changed, 11 insertions, 7 deletions
diff --git a/git-revert.sh b/git-revert.sh
index 05bd854f4..4ba6912f0 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -7,11 +7,13 @@
case "$0" in
*-revert* )
+ test -t 0 && edit=-e
me=revert ;;
*-cherry-pick* )
+ edit=
me=cherry-pick ;;
* )
- die "What are ou talking about?" ;;
+ die "What are you talking about?" ;;
esac
usage () {
@@ -25,7 +27,7 @@ usage () {
esac
}
-no_commit= replay= edit=
+no_commit= replay=
while case "$#" in 0) break ;; esac
do
case "$1" in
@@ -33,12 +35,15 @@ do
--no-commi|--no-commit)
no_commit=t
;;
+ -e|--e|--ed|--edi|--edit)
+ edit=-e
+ ;;
+ -n|--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+ edit=
+ ;;
-r|--r|--re|--rep|--repl|--repla|--replay)
replay=t
;;
- -e|--edit)
- edit=t
- ;;
-*)
usage
;;
@@ -164,10 +169,9 @@ echo >&2 "Finished one $me."
# If we are revert, or if our cherry-pick results in a hand merge,
# we had better say that the current user is responsible for that.
-[ "$edit" ] && ${EDITOR:-${VISUAL:-vi}} .msg
case "$no_commit" in
'')
- git-commit -n -F .msg
+ git-commit -n -F .msg $edit
rm -f .msg
;;
esac