Allow editing of a revert-message

Allow editing of a revert-message

[Linus Torvalds]

I think all commit operations should allow editing of the message (ie we 
should do this for merges too), but that's _particularly_ true of doing a 
"git revert".

We should always explain why we needed to revert something.

This patch adds a "-e" or "--edit" flag to "git revert", although I 
actually suspect it should be on by default (and we should have a 
"--no-edit" flag to disable it, probably together with an automatic 
disable if stdin isn't a terminal).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
diff --git a/git-revert.sh b/git-revert.sh
index 4154fe0..05bd854 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -25,7 +25,7 @@ usage () {
 	esac
 }
 
-no_commit= replay=
+no_commit= replay= edit=
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in
@@ -36,6 +36,9 @@ do
 	-r|--r|--re|--rep|--repl|--repla|--replay)
 		replay=t
 		;;
+	-e|--edit)
+		edit=t
+		;;
 	-*)
 		usage
 		;;
@@ -161,6 +164,7 @@ 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

Re: Allow editing of a revert-message

[Junio C Hamano]

Linus Torvalds <torvalds@osdl.org> writes:

> ..., although I 
> actually suspect it should be on by default (and we should have a 
> "--no-edit" flag to disable it, probably together with an automatic 
> disable if stdin isn't a terminal).

Thanks, and I agree.  It is very very unlikely that somebody has
git-revert in her script and relies on git-revert to be
non-interactive, so we might not even need --no-edit.

> +[ "$edit" ] && ${EDITOR:-${VISUAL:-vi}} .msg
>  case "$no_commit" in
>  '')
>  	git-commit -n -F .msg

I think we can do

	-e)
		edit="-e" ;;
        ..

	git-commit -n -F .msg $edit

to lose the ${EDITOR-${VISUAL-vi}} part..

Re: Allow editing of a revert-message

[Linus Torvalds]

On Wed, 23 Nov 2005, Junio C Hamano wrote:
>
> I think we can do
> 
> 	-e)
> 		edit="-e" ;;
>         ..
> 
> 	git-commit -n -F .msg $edit
> 
> to lose the ${EDITOR-${VISUAL-vi}} part..

You are of course right. That would also fix the total idiocy of my patch 
that had you editing the message even if it wasn't used due to a "-n" that 
disables commits ;)

		Linus