Andrew's git - gitweb.git/blob - git-format-patch.sh

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6. git-sh-setup || die "Not a git archive."
   7
   8usage () {
   9    echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox] [--check] [--signoff] [-<diff options>...] upstream [ our-head ]
  10
  11Prepare each commit with its patch since our-head forked from upstream,
  12one file per patch, for e-mail submission.  Each output file is
  13numbered sequentially from 1, and uses the first line of the commit
  14message (massaged for pathname safety) as the filename.
  15
  16When -o is specified, output files are created in that directory; otherwise in
  17the current working directory.
  18
  19When -n is specified, instead of "[PATCH] Subject", the first line is formatted
  20as "[PATCH N/M] Subject", unless you have only one patch.
  21
  22When --mbox is specified, the output is formatted to resemble
  23UNIX mailbox format, and can be concatenated together for processing
  24with applymbox.
  25'
  26    exit 1
  27}
  28
  29diff_opts=
  30LF='
  31'
  32
  33outdir=./
  34while case "$#" in 0) break;; esac
  35do
  36    case "$1" in
  37    -a|--a|--au|--aut|--auth|--autho|--author)
  38    author=t ;;
  39    -c|--c|--ch|--che|--chec|--check)
  40    check=t ;;
  41    -d|--d|--da|--dat|--date)
  42    date=t ;;
  43    -m|--m|--mb|--mbo|--mbox)
  44    date=t author=t mbox=t ;;
  45    -k|--k|--ke|--kee|--keep|--keep-|--keep-s|--keep-su|--keep-sub|\
  46    --keep-subj|--keep-subje|--keep-subjec|--keep-subject)
  47    keep_subject=t ;;
  48    -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
  49    numbered=t ;;
  50    -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
  51    signoff=t ;;
  52    --st|--std|--stdo|--stdou|--stdout)
  53    stdout=t mbox=t date=t author=t ;;
  54    -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\
  55    --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\
  56    --output-direc=*|--output-direct=*|--output-directo=*|\
  57    --output-director=*|--output-directory=*)
  58    outdir=`expr "$1" : '-[^=]*=\(.*\)'` ;;
  59    -o|--o|--ou|--out|--outp|--outpu|--output|--output-|--output-d|\
  60    --output-di|--output-dir|--output-dire|--output-direc|--output-direct|\
  61    --output-directo|--output-director|--output-directory)
  62    case "$#" in 1) usage ;; esac; shift
  63    outdir="$1" ;;
  64    -*' '* | -*"$LF"* | -*'     '*)
  65        # Ignore diff option that has whitespace for now.
  66        ;;
  67    -*) diff_opts="$diff_opts$1 " ;;
  68    *) break ;;
  69    esac
  70    shift
  71done
  72
  73case "$keep_subject$numbered" in
  74tt)
  75        die '--keep-subject and --numbered are incompatible.' ;;
  76esac
  77
  78rev1= rev2=
  79case "$#" in
  802)
  81    rev1="$1" rev2="$2" ;;
  821)
  83    case "$1" in
  84    *..*)
  85        rev1=`expr "$1" : '\(.*\)\.\.'`
  86        rev2=`expr "$1" : '.*\.\.\(.*\)'`
  87        ;;
  88    *)
  89        rev1="$1"
  90        rev2="HEAD"
  91        ;;
  92    esac ;;
  93*)
  94    usage ;;
  95esac
  96
  97me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
  98
  99case "$outdir" in
 100*/) ;;
 101*) outdir="$outdir/" ;;
 102esac
 103test -d "$outdir" || mkdir -p "$outdir" || exit
 104
 105tmp=.tmp-series$$
 106trap 'rm -f $tmp-*' 0 1 2 3 15
 107
 108series=$tmp-series
 109commsg=$tmp-commsg
 110filelist=$tmp-files
 111
 112titleScript='
 113        /./d
 114        /^$/n
 115        s/^\[PATCH[^]]*\] *//
 116        s/[^-a-z.A-Z_0-9]/-/g
 117        s/\.\.\.*/\./g
 118        s/\.*$//
 119        s/--*/-/g
 120        s/^-//
 121        s/-$//
 122        s/$/./
 123        p
 124        q
 125'
 126
 127whosepatchScript='
 128/^author /{
 129        s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
 130        q
 131}'
 132
 133git-cherry -v "$rev1" "$rev2" |
 134while read sign rev comment
 135do
 136        case "$sign" in
 137        '-')
 138                echo >&2 "Merged already: $comment"
 139                ;;
 140        *)
 141                echo $rev
 142                ;;
 143        esac
 144done >$series
 145
 146process_one () {
 147        mailScript='
 148        /./d
 149        /^$/n'
 150        case "$keep_subject" in
 151        t)  ;;
 152        *)
 153            mailScript="$mailScript"'
 154            s|^\[PATCH[^]]*\] *||
 155            s|^|[PATCH'"$num"'] |'
 156            ;;
 157        esac
 158        mailScript="$mailScript"'
 159        s|^|Subject: |'
 160        case "$mbox" in
 161        t)
 162            echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line
 163            ;;
 164        esac
 165
 166        eval "$(sed -ne "$whosepatchScript" $commsg)"
 167        test "$author,$au" = ",$me" || {
 168                mailScript="$mailScript"'
 169        a\
 170From: '"$au"
 171        }
 172        test "$date,$au" = ",$me" || {
 173                mailScript="$mailScript"'
 174        a\
 175Date: '"$ad"
 176        }
 177
 178        mailScript="$mailScript"'
 179        : body
 180        p
 181        n
 182        b body'
 183
 184        (cat $commsg ; echo; echo) |
 185        sed -ne "$mailScript" |
 186        git-stripspace
 187
 188        test "$signoff" = "t" && {
 189                offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`
 190                line="Signed-off-by: $offsigner"
 191                grep -q "^$line\$" $commsg || {
 192                        echo
 193                        echo "$line"
 194                        echo
 195                }
 196        }
 197        echo
 198        echo '---'
 199        echo
 200        git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
 201        echo
 202        git-cat-file commit "$commit^" | sed -e 's/^tree /applies-to: /' -e q
 203        git-diff-tree -p $diff_opts "$commit"
 204        echo "---"
 205        echo "@@GIT_VERSION@@"
 206
 207        case "$mbox" in
 208        t)
 209                echo
 210                ;;
 211        esac
 212}
 213
 214total=`wc -l <$series | tr -dc "[0-9]"`
 215i=1
 216while read commit
 217do
 218    git-cat-file commit "$commit" | git-stripspace >$commsg
 219    title=`sed -ne "$titleScript" <$commsg`
 220    case "$numbered" in
 221    '') num= ;;
 222    *)
 223        case $total in
 224        1) num= ;;
 225        *) num=' '`printf "%d/%d" $i $total` ;;
 226        esac
 227    esac
 228
 229    file=`printf '%04d-%stxt' $i "$title"`
 230    if test '' = "$stdout"
 231    then
 232            echo "* $file"
 233            process_one >"$outdir$file"
 234            if test t = "$check"
 235            then
 236                # This is slightly modified from Andrew Morton's Perfect Patch.
 237                # Lines you introduce should not have trailing whitespace.
 238                # Also check for an indentation that has SP before a TAB.
 239                grep -n '^+\([  ]*      .*\|.*[         ]\)$' "$outdir$file"
 240                :
 241            fi
 242    else
 243            echo >&2 "* $file"
 244            process_one
 245    fi
 246    i=`expr "$i" + 1`
 247done <$series