diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-13 13:33:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-13 13:33:07 -0800 |
| commit | 5ac2715f2eaacc7c76ac03680a0d7a16a30946f2 (patch) | |
| tree | eaabe2a7fc842d660c534130c558dad5d640fd83 /git-commit.sh | |
| parent | a731ec5eb827767e0f054641ab1eacc632113c59 (diff) | |
| download | git-5ac2715f2eaacc7c76ac03680a0d7a16a30946f2.tar.gz | |
Consistent message encoding while reusing log from an existing commit.
The following commands can reuse log message from an existing
commit while creating a new commit:
git-cherry-pick
git-rebase (both with and without --merge)
git-commit (-c and -C)
When the original commit was made in a different encoding from
the current i18n.commitencoding, "cat-file commit" would give a
string that is inconsistent with what the resulting commit will
claim to be in. Replace them with "git show -s --encoding".
"git-rebase" without --merge is "git format-patch" piped to "git
am" in essence, and has been taken care of before this commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-commit.sh b/git-commit.sh index eddd863015..b6387239dd 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -435,7 +435,9 @@ then fi elif test "$use_commit" != "" then - git-cat-file commit "$use_commit" | sed -e '1,/^$/d' + encoding=$(git repo-config i18n.commitencoding || echo UTF-8) + git show -s --pretty=raw --encoding="$encoding" "$use_commit" | + sed -e '1,/^$/d' -e 's/^ //' elif test -f "$GIT_DIR/MERGE_MSG" then cat "$GIT_DIR/MERGE_MSG" @@ -497,7 +499,8 @@ then q } ' - set_author_env=`git-cat-file commit "$use_commit" | + encoding=$(git repo-config i18n.commitencoding || echo UTF-8) + set_author_env=`git show -s --pretty=raw --encoding="$encoding" "$use_commit" | LANG=C LC_ALL=C sed -ne "$pick_author_script"` eval "$set_author_env" export GIT_AUTHOR_NAME |