mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/int'

Browse Source 
* 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.
This commit is contained in:
Junio C Hamano
2007-01-14 12:04:25 -08:00
parent 6de33478af c34c6008bc
commit f4b6c6b90f
6 changed files with 334 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-commit.sh
View File

@ -429,7 +429,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"
@ -491,7 +493,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