X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-revert.sh;h=de8b5f0f0fbb42e82327670e6916382f6f2d3e47;hp=05bd854f4b316a34020cd3a600be0518313f9319;hb=HEAD;hpb=30c7bb249e9b2038dd05271e055d347f84336576

diff --git a/git-revert.sh b/git-revert.sh
index 05bd854f..de8b5f0f 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -3,29 +3,22 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-. git-sh-setup || die "Not a git archive"
 
 case "$0" in
 *-revert* )
-	me=revert ;;
+	test -t 0 && edit=-e
+	me=revert
+	USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
 *-cherry-pick* )
-	me=cherry-pick ;;
+	edit=
+	me=cherry-pick
+	USAGE='[--edit] [-n] [-r] <commit-ish>'  ;;
 * )
-	die "What are ou talking about?" ;;
+	die "What are you talking about?" ;;
 esac
+. git-sh-setup
 
-usage () {
-	case "$me" in
-	cherry-pick)
-		die "usage git $me [-n] [-r] <commit-ish>"
-		;;
-	revert)
-		die "usage git $me [-n] <commit-ish>"
-		;;
-	esac
-}
-
-no_commit= replay= edit=
+no_commit= replay=
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in
@@ -33,12 +26,15 @@ do
 	    --no-commi|--no-commit)
 		no_commit=t
 		;;
+	-e|--e|--ed|--edi|--edit)
+		edit=-e
+		;;
+	--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
 		;;
@@ -97,6 +93,7 @@ revert)
 cherry-pick)
 	pick_author_script='
 	/^author /{
+		s/'\''/'\''\\'\'\''/g
 		h
 		s/^author \([^<]*\) <[^>]*> .*$/\1/
 		s/'\''/'\''\'\'\''/g
@@ -140,12 +137,13 @@ esac >.msg
 # $prev and $commit on top of us (when cherry-picking or replaying).
 
 echo >&2 "First trying simple merge strategy to $me."
-git-read-tree -m -u $base $head $next &&
+git-read-tree -m -u --aggressive $base $head $next &&
 result=$(git-write-tree 2>/dev/null) || {
     echo >&2 "Simple $me fails; trying Automatic $me."
     git-merge-index -o git-merge-one-file -a || {
-	    echo >&2 "Automatic $me failed.  After fixing it up,"
-	    echo >&2 "you can use \"git commit -F .msg\""
+	    echo >&2 "Automatic $me failed.  After resolving the conflicts,"
+	    echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+	    echo >&2 "and commit with 'git commit -F .msg'"
 	    case "$me" in
 	    cherry-pick)
 		echo >&2 "You may choose to use the following when making"
@@ -164,10 +162,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