[PATCH] Fix git-merge-cache -q

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

diff --git a/git-format-patch-script b/git-format-patch-script
index a07e30e..51e8af0 100755 (executable)
--- a/git-format-patch-script
+++ b/git-format-patch-script
@@ -4,7 +4,7 @@
 #
 
 usage () {
-    echo >&2 "usage: $0"' [-n] [-o dir] [-<diff options>...] upstream [ our-head ]
+    echo >&2 "usage: $0"' [-n] [-o dir] [--mbox] [--check] [-<diff options>...] upstream [ our-head ]
 
 Prepare each commit with its patch since our-head forked from upstream,
 one file per patch, for e-mail submission.  Each output file is
@@ -16,6 +16,10 @@ the current working directory.
 
 When -n is specified, instead of "[PATCH] Subject", the first line is formatted
 as "[PATCH N/M] Subject", unless you have only one patch.
+
+When --mbox is specified, the output is formatted to resemble
+UNIX mailbox format, and can be concatenated together for processing
+with applymbox.
 '
     exit 1
 }
@@ -25,11 +29,19 @@ IFS='
 '
 LF='
 '
-outdir=./
 
+outdir=./
 while case "$#" in 0) break;; esac
 do
     case "$1" in
+    -a|--a|--au|--aut|--auth|--autho|--author)
+    author=t ;;
+    -c|--c|--ch|--che|--chec|--check)
+    check=t ;;
+    -d|--d|--da|--dat|--date)
+    date=t ;;
+    -m|--m|--mb|--mbo|--mbox)
+    date=t author=t mbox=t ;;
     -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
     numbered=t ;;
     -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\
@@ -53,6 +65,10 @@ case "$#" in
 1)    linus="$1" junio=HEAD ;;
 *)    usage ;;
 esac
+junio=`git-rev-parse --verify "$junio"`
+linus=`git-rev-parse --verify "$linus"`
+
+me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
 
 case "$outdir" in
 */) ;;
@@ -64,11 +80,13 @@ tmp=.tmp-series$$
 trap 'rm -f $tmp-*' 0 1 2 3 15
 
 series=$tmp-series
+commsg=$tmp-commsg
+filelist=$tmp-files
 
 titleScript='
-       1,/^$/d
-       : loop
-       /^$/b loop
+       /./d
+       /^$/n
+       s/^\[PATCH[^]]*\] *//
        s/[^-a-z.A-Z_0-9]/-/g
         s/\.\.\.*/\./g
        s/\.*$//
@@ -76,19 +94,27 @@ titleScript='
        s/^-//
        s/-$//
        s/$/./
+       p
        q
 '
 
+whosepatchScript='
+/^author /{
+       s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
+       q
+}'
+
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'
 
 git-rev-list --merge-order "$junio" "^$linus" >$series
-total=`wc -l <$series`
+total=`wc -l <$series | tr -dc "[0-9]"`
 i=$total
 while read commit
 do
-    title=`git-cat-file commit "$commit" | sed -e "$titleScript"`
+    git-cat-file commit "$commit" | git-stripspace >$commsg
+    title=`sed -ne "$titleScript" <$commsg`
     case "$numbered" in
     '') num= ;;
     *)
@@ -97,25 +123,66 @@ do
        *) num=' '`printf "%d/%d" $i $total` ;;
        esac
     esac
+
     file=`printf '%04d-%stxt' $i "$title"`
     i=`expr "$i" - 1`
-    echo "$file"
+    echo >&2 "* $file"
     {
        mailScript='
-       1,/^$/d
-       : loop
-       /^$/b loop
-       s|^|[PATCH'"$num"'] |
+       /./d
+       /^$/n
+       s|^\[PATCH[^]]*\] *||'
+
+       case "$mbox" in
+       t)
+           echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line
+           mailScript="$mailScript"'
+           s|^|Subject: [PATCH'"$num"'] |'
+           ;;
+       *)
+           mailScript="$mailScript"'
+           s|^|[PATCH'"$num"'] |'
+           ;;
+       esac
+
+       eval "$(sed -ne "$whosepatchScript" $commsg)"
+       test "$author,$au" = ",$me" || {
+               mailScript="$mailScript"'
+       a\
+From: '"$au"
+       }
+       test "$date,$au" = ",$me" || {
+               mailScript="$mailScript"'
+       a\
+Date: '"$ad"
+       }
+
+       mailScript="$mailScript"'
        : body
        p
        n
        b body'
 
-       git-cat-file commit "$commit" | sed -ne "$mailScript"
+       sed -ne "$mailScript" <$commsg
        echo '---'
        echo
        git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
        echo
        git-diff-tree -p $diff_opts "$commit" | sed -e "$stripCommitHead"
+
+       case "$mbox" in
+       t)
+               echo
+               ;;
+       esac
     } >"$outdir$file"
+    case "$check" in
+    t)
+       # This is slightly modified from Andrew Morton's Perfect Patch.
+       # Lines you introduce should not have trailing whitespace.
+       # Also check for an indentation that has SP before a TAB.
+        grep -n '^+\([         ]*      .*\|.*[         ]\)$' "$outdir$file"
+
+       : do not exit with non-zero because we saw no problem in the last one.
+    esac
 done <$series