projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'
[git.git]
/
git-format-patch.sh
diff --git
a/git-format-patch.sh
b/git-format-patch.sh
index
9b40880
..
1eebe85
100755
(executable)
--- a/
git-format-patch.sh
+++ b/
git-format-patch.sh
@@
-5,6
+5,10
@@
. git-sh-setup
. git-sh-setup
+# Force diff to run in C locale.
+LANG=C LC_ALL=C
+export LANG LC_ALL
+
usage () {
echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
[--check] [--signoff] [-<diff options>...]
usage () {
echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
[--check] [--signoff] [-<diff options>...]
@@
-202,7
+206,7
@@
process_one () {
;;
esac
;;
esac
- eval "$(
LANG=C LC_ALL=C
sed -ne "$whosepatchScript" $commsg)"
+ eval "$(sed -ne "$whosepatchScript" $commsg)"
test "$author,$au" = ",$me" || {
mailScript="$mailScript"'
a\
test "$author,$au" = ",$me" || {
mailScript="$mailScript"'
a\
@@
-238,9
+242,8
@@
Date: '"$ad"
echo
git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
echo
echo
git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
echo
- git-cat-file commit "$commit^" | sed -e 's/^tree /applies-to: /' -e q
git-diff-tree -p $diff_opts "$commit"
git-diff-tree -p $diff_opts "$commit"
- echo "--
-
"
+ echo "--
"
echo "@@GIT_VERSION@@"
case "$mbox" in
echo "@@GIT_VERSION@@"
case "$mbox" in