projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format-patch: remove applies-to.
[git.git]
/
git-revert.sh
diff --git
a/git-revert.sh
b/git-revert.sh
index
722c4f7
..
c1aebb1
100755
(executable)
--- a/
git-revert.sh
+++ b/
git-revert.sh
@@
-3,15
+3,17
@@
# 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"
+. git-sh-setup
case "$0" in
*-revert* )
case "$0" in
*-revert* )
+ test -t 0 && edit=-e
me=revert ;;
*-cherry-pick* )
me=revert ;;
*-cherry-pick* )
+ edit=
me=cherry-pick ;;
* )
me=cherry-pick ;;
* )
- die "What are ou talking about?" ;;
+ die "What are
y
ou talking about?" ;;
esac
usage () {
esac
usage () {
@@
-33,6
+35,12
@@
do
--no-commi|--no-commit)
no_commit=t
;;
--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
;;
-r|--r|--re|--rep|--repl|--repla|--replay)
replay=t
;;
@@
-56,9
+64,12
@@
t)
die "Your index file is unmerged."
;;
*)
die "Your index file is unmerged."
;;
*)
- check_clean_tree || die "Cannot run $me from a dirty tree."
head=$(git-rev-parse --verify HEAD) ||
die "You do not have a valid HEAD"
head=$(git-rev-parse --verify HEAD) ||
die "You do not have a valid HEAD"
+ files=$(git-diff-index --cached --name-only $head) || exit
+ if [ "$files" ]; then
+ die "Dirty index: cannot $me (dirty: $files)"
+ fi
;;
esac
;;
esac
@@
-109,7
+120,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
@@
-160,7
+171,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