X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-revert.sh;h=4154fe0d15456697185115c70ac6df59eabd2869;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=722c4f755af5ea07981712d8abf6d6eed81c5d56;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-revert.sh b/git-revert.sh
index 722c4f75..4154fe0d 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -56,9 +56,12 @@ t)
 		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"
+	files=$(git-diff-index --cached --name-only $head) || exit
+	if [ "$files" ]; then
+		die "Dirty index: cannot $me (dirty: $files)"
+	fi
 	;;
 esac
 
@@ -109,7 +112,7 @@ cherry-pick)
 		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