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>

diff --git a/git-commit.sh b/git-commit.sh
index daf90f1e58242f069e2fde5f44677f60a98e2a0c..41955e8e64da2d2e04ab4a2890c673a39fc20ffe 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -184,7 +184,7 @@ then
                }
                '
                set_author_env=`git-cat-file commit "$use_commit" |
                }
                '
                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
                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 548d2d5847ee3ae34605316d34abef7c22832540..7ee5d328c0324cc29a0f93a9ff4d9f8a8e19891e 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -201,7 +201,7 @@ process_one () {
            ;;
        esac
 
            ;;
        esac
 

-       eval "$(sed -ne "$whosepatchScript" $commsg)"
+       eval "$(LANG=C LC_ALL=C sed -ne "$whosepatchScript" $commsg)"

        test "$author,$au" = ",$me" || {
                mailScript="$mailScript"'
        a\
        test "$author,$au" = ",$me" || {
                mailScript="$mailScript"'
        a\

diff --git a/git-revert.sh b/git-revert.sh
index dfd914cf561c10f92ef2f3207446800de70c4834..4154fe0d15456697185115c70ac6df59eabd2869 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -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