aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-10 23:34:08 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-11 00:37:34 -0800
commite3e291fc07b49b74bb655ca854bdb19e849e044c (patch)
tree24777ef8ff471ee4d1f6174bfb53c71fd88ca1d6
parent605607cc622478fb2e8dfcab2ff16f54b0995599 (diff)
downloadgit-e3e291fc07b49b74bb655ca854bdb19e849e044c.tar.gz
git-e3e291fc07b49b74bb655ca854bdb19e849e044c.tar.xz
Do not lose author name information to locale gotchas.
I noticed format-patch loses authorship information of Lukas' patch when I run git tools with LC_LANG set to ja_JP. It turns out that the sed script to set environment variables were not working on his name (encoded in UTF-8), which is unfortunate but technically correct. Force sed invocation under C locale because we always want literal byte semantics. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-commit.sh2
-rwxr-xr-xgit-format-patch.sh2
-rwxr-xr-xgit-revert.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/git-commit.sh b/git-commit.sh
index daf90f1e5..41955e8e6 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -184,7 +184,7 @@ then
}
'
set_author_env=`git-cat-file commit "$use_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
diff --git a/git-format-patch.sh b/git-format-patch.sh
index 548d2d584..7ee5d328c 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -201,7 +201,7 @@ process_one () {
;;
esac
- eval "$(sed -ne "$whosepatchScript" $commsg)"
+ eval "$(LANG=C LC_ALL=C sed -ne "$whosepatchScript" $commsg)"
test "$author,$au" = ",$me" || {
mailScript="$mailScript"'
a\
diff --git a/git-revert.sh b/git-revert.sh
index dfd914cf5..4154fe0d1 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -112,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