Skip to content

Commit

Permalink
git-revert: make --edit default.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Nov 24, 2005
1 parent 30c7bb2 commit b788498
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions git-revert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand All @@ -25,20 +27,23 @@ usage () {
esac
}

no_commit= replay= edit=
no_commit= replay=
while case "$#" in 0) break ;; esac
do
case "$1" in
-n|--n|--no|--no-|--no-c|--no-co|--no-com|--no-comm|\
--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
;;
Expand Down Expand Up @@ -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

0 comments on commit b788498

Please sign in to comment.