X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-format-patch.sh;h=7ee5d328c0324cc29a0f93a9ff4d9f8a8e19891e;hb=0adb3358f6538aaa9006f4068d6757cd506afcdd;hp=5b93ff80a06f385c11cdaa6b5a41eaee5ae9cbc1;hpb=bd7c8aab7098e6e340060c0d7f1fab8595905b2d;p=git.git diff --git a/git-format-patch.sh b/git-format-patch.sh index 5b93ff80..7ee5d328 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -8,6 +8,7 @@ usage () { echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox] [--check] [--signoff] [-...] + [--help] ( from..to ... | upstream [ our-head ] ) Prepare each commit with its patch since our-head forked from upstream, @@ -63,6 +64,9 @@ do --output-directo|--output-director|--output-directory) case "$#" in 1) usage ;; esac; shift outdir="$1" ;; + -h|--h|--he|--hel|--help) + usage + ;; -*' '* | -*"$LF"* | -*' '*) # Ignore diff option that has whitespace for now. ;; @@ -101,7 +105,7 @@ case "$#,$1" in ;; 1,?*..) # single "rev1.." should mean "rev1..HEAD" - set x "$1"HEAD" + set x "$1"HEAD shift ;; 1,*) @@ -197,7 +201,7 @@ process_one () { ;; esac - eval "$(sed -ne "$whosepatchScript" $commsg)" + eval "$(LANG=C LC_ALL=C sed -ne "$whosepatchScript" $commsg)" test "$author,$au" = ",$me" || { mailScript="$mailScript"' a\