diff options
author | Junio C Hamano <junkio@cox.net> | 2007-01-14 23:04:25 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 23:04:25 +0300 |
commit | f4b6c6b90fdce12d69e4ad80ff6082405ec8cfb8 (patch) | |
tree | 53977ce9f7f60973239db3de43060cf947aa5a43 /git-revert.sh | |
parent | 6de33478affbf252066cc5863add213ca5cdc13c (diff) | |
parent | c34c6008bcf2c66e17a97acc89be1144a6216f3f (diff) |
Merge branch 'jc/int'
* jc/int:
More tests in t3901.
Consistent message encoding while reusing log from an existing commit.
t3901: test "format-patch | am" pipe with i18n
Use log output encoding in --pretty=email headers.
Diffstat (limited to 'git-revert.sh')
-rwxr-xr-x | git-revert.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/git-revert.sh b/git-revert.sh index 224e6540ca..71cbcbc2b8 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -81,6 +81,8 @@ prev=$(git-rev-parse --verify "$commit^1" 2>/dev/null) || git-rev-parse --verify "$commit^2" >/dev/null 2>&1 && die "Cannot run $me a multi-parent commit." +encoding=$(git repo-config i18n.commitencoding || echo UTF-8) + # "commit" is an existing commit. We would want to apply # the difference it introduces since its first parent "prev" # on top of the current HEAD if we are cherry-pick. Or the @@ -88,10 +90,11 @@ git-rev-parse --verify "$commit^2" >/dev/null 2>&1 && case "$me" in revert) - git-rev-list --pretty=oneline --max-count=1 $commit | + git show -s --pretty=oneline --encoding="$encoding" $commit | sed -e ' s/^[^ ]* /Revert "/ - s/$/"/' + s/$/"/ + ' echo echo "This reverts commit $commit." test "$rev" = "$commit" || @@ -120,14 +123,17 @@ cherry-pick) q }' - set_author_env=`git-cat-file commit "$commit" | + + logmsg=`git show -s --pretty=raw --encoding="$encoding" "$commit"` + set_author_env=`echo "$logmsg" | LANG=C LC_ALL=C sed -ne "$pick_author_script"` eval "$set_author_env" export GIT_AUTHOR_NAME export GIT_AUTHOR_EMAIL export GIT_AUTHOR_DATE - git-cat-file commit $commit | sed -e '1,/^$/d' + echo "$logmsg" | + sed -e '1,/^$/d' -e 's/^ //' case "$replay" in '') echo "(cherry picked from commit $commit)" |