From 51b3c00e9d95371a9ad202204f01c5981f241b20 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 26 Nov 2005 12:09:07 -0800 Subject: format-patch: output filename reported to stdout verbatim. Prepending asterisk to the output was just adding noise, and making scripts like proposed git-send-mail by Andreas Ericsson do unnecessary work. Signed-off-by: Junio C Hamano --- git-format-patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-format-patch.sh') diff --git a/git-format-patch.sh b/git-format-patch.sh index bc56876531..9b4088045a 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -268,7 +268,7 @@ do file=`printf '%04d-%stxt' $i "$title"` if test '' = "$stdout" then - echo "* $file" + echo "$file" process_one >"$outdir$file" if test t = "$check" then @@ -279,7 +279,7 @@ do : fi else - echo >&2 "* $file" + echo >&2 "$file" process_one fi i=`expr "$i" + 1` -- cgit v1.3 From 99e368b996d6fcc2383a4b385130a0cb70c164e2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 29 Nov 2005 13:51:27 -0800 Subject: format-patch: remove applies-to. The attempt to help 3-way fallback by recording the tree object id for the entire pre-image was unnecessary, and we already have an better alternative in the form of per-blob "index" lines. Signed-off-by: Junio C Hamano --- git-format-patch.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'git-format-patch.sh') diff --git a/git-format-patch.sh b/git-format-patch.sh index 9b4088045a..a26d46dba0 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -238,7 +238,6 @@ Date: '"$ad" 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" echo "---" echo "@@GIT_VERSION@@" -- cgit v1.3 From a004d3f70f1c074f2d9bd55e7a925ff5916ebbeb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 29 Nov 2005 13:51:27 -0800 Subject: format-patch: do not abuse 3-dash marker line. Before GIT version at the end of output we used a 3-dash marker; but 3-dash marker is special and should not be overused. Instead, use "-- " which is a standard practice in e-mails to signal the beginning of trailing garbage. Signed-off-by: Junio C Hamano --- git-format-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-format-patch.sh') diff --git a/git-format-patch.sh b/git-format-patch.sh index a26d46dba0..4cd38f34ef 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -239,7 +239,7 @@ Date: '"$ad" git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary echo git-diff-tree -p $diff_opts "$commit" - echo "---" + echo "-- " echo "@@GIT_VERSION@@" case "$mbox" in -- cgit v1.3 From 830273d10cf1cfe646db39b87d3ccb49bf88b73a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 29 Nov 2005 13:51:27 -0800 Subject: format-patch: run diff in C locale Otherwise it would show incomplete line and binary markers in a locale dependent way. Signed-off-by: Junio C Hamano --- git-format-patch.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'git-format-patch.sh') diff --git a/git-format-patch.sh b/git-format-patch.sh index 4cd38f34ef..1eebe857c0 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -5,6 +5,10 @@ . 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] [-...] @@ -202,7 +206,7 @@ process_one () { ;; esac - eval "$(LANG=C LC_ALL=C sed -ne "$whosepatchScript" $commsg)" + eval "$(sed -ne "$whosepatchScript" $commsg)" test "$author,$au" = ",$me" || { mailScript="$mailScript"' a\ -- cgit v1.3