daemon: Set SO_REUSEADDR on listening sockets.

diff --git a/git-revert.sh b/git-revert.sh
index 4154fe0d15456697185115c70ac6df59eabd2869..2c5870684c9a0993116a86a511a0e9998a27b621 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -3,27 +3,20 @@
 # 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
-
-usage () {
-       case "$me" in
-       cherry-pick)
-               die "usage git $me [-n] [-r] <commit-ish>"
-               ;;
-       revert)
-               die "usage git $me [-n] <commit-ish>"
-               ;;
-       esac
-}
+. git-sh-setup
 
 no_commit= replay=
 while case "$#" in 0) break ;; esac
@@ -33,6 +26,12 @@ 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
                ;;
@@ -94,6 +93,7 @@ revert)
 cherry-pick)
        pick_author_script='
        /^author /{
+               s/'\''/'\''\\'\'\''/g
                h
                s/^author \([^<]*\) <[^>]*> .*$/\1/
                s/'\''/'\''\'\'\''/g
@@ -163,7 +163,7 @@ echo >&2 "Finished one $me."
 
 case "$no_commit" in
 '')
-       git-commit -n -F .msg
+       git-commit -n -F .msg $edit
        rm -f .msg
        ;;
 esac