Document the --(no-)edit switch of git-revert and git-cherry-pick

[git.git] / git-format-patch.sh

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 351790c..1eebe85 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -3,7 +3,11 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup || die "Not a git archive."
+. 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]
@@ -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\
@@ -238,9 +242,8 @@ 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 "-- "
        echo "@@GIT_VERSION@@"
 
        case "$mbox" in
@@ -268,7 +271,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 +282,7 @@ do
                :
            fi
     else
-           echo >&2 "* $file"
+           echo >&2 "$file"
            process_one
     fi
     i=`expr "$i" + 1`