merge-recursive: adjust git-ls-tree use for the latest.

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 5b93ff80a06f385c11cdaa6b5a41eaee5ae9cbc1..1eebe857c021495b92d9e39ec1193b85ab4e980e 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -3,11 +3,16 @@
 # 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]
     [--check] [--signoff] [-<diff options>...]
+    [--help]
     ( from..to ... | upstream [ our-head ] )
 
 Prepare each commit with its patch since our-head forked from upstream,
@@ -63,6 +68,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.
        ;;
@@ -95,13 +103,13 @@ filelist=$tmp-files
 # Also, "rev1.." should mean "rev1..HEAD"; git-diff users are
 # familiar with that syntax.
 
-case "$#,$1" in
+case "$#,$1$2" in
 1,?*..?*)
        # single "rev1..rev2"
        ;;
 1,?*..)
        # single "rev1.." should mean "rev1..HEAD"
-       set x "$1"HEAD"
+       set x "$1"HEAD
        shift
        ;;
 1,*)
@@ -127,7 +135,8 @@ do
                rev2=`expr "$revpair" : '.*\.\.\(.*\)'`
                ;;
        *)
-               usage
+               rev1="$revpair^"
+               rev2="$revpair"
                ;;
        esac
        git-rev-parse --verify "$rev1^0" >/dev/null 2>&1 ||
@@ -233,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
@@ -263,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
@@ -274,7 +282,7 @@ do
                :
            fi
     else
-           echo >&2 "* $file"
+           echo >&2 "$file"
            process_one
     fi
     i=`expr "$i" + 1`