projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "gmake -j"
[git.git]
/
git-revert.sh
diff --git
a/git-revert.sh
b/git-revert.sh
index
dfd914c
..
2c58706
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
#
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2005 Junio C Hamano
#
-. git-sh-setup || die "Not a git archive"
case "$0" in
*-revert* )
case "$0" in
*-revert* )
- me=revert ;;
+ test -t 0 && edit=-e
+ me=revert
+ USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
*-cherry-pick* )
*-cherry-pick* )
- me=cherry-pick ;;
+ edit=
+ me=cherry-pick
+ USAGE='[--edit] [-n] [-r] <commit-ish>' ;;
* )
* )
- die "What are ou talking about?" ;;
+ die "What are
y
ou talking about?" ;;
esac
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
no_commit= replay=
while case "$#" in 0) break ;; esac
@@
-33,6
+26,12
@@
do
--no-commi|--no-commit)
no_commit=t
;;
--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
;;
-r|--r|--re|--rep|--repl|--repla|--replay)
replay=t
;;
@@
-94,6
+93,7
@@
revert)
cherry-pick)
pick_author_script='
/^author /{
cherry-pick)
pick_author_script='
/^author /{
+ s/'\''/'\''\\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g
@@
-112,7
+112,7
@@
cherry-pick)
q
}'
set_author_env=`git-cat-file commit "$commit" |
q
}'
set_author_env=`git-cat-file commit "$commit" |
- sed -ne "$pick_author_script"`
+
LANG=C LC_ALL=C
sed -ne "$pick_author_script"`
eval "$set_author_env"
export GIT_AUTHOR_NAME
export GIT_AUTHOR_EMAIL
eval "$set_author_env"
export GIT_AUTHOR_NAME
export GIT_AUTHOR_EMAIL
@@
-163,7
+163,7
@@
echo >&2 "Finished one $me."
case "$no_commit" in
'')
case "$no_commit" in
'')
- git-commit -n -F .msg
+ git-commit -n -F .msg
$edit
rm -f .msg
;;
esac
rm -f .msg
;;
esac