diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-16 15:23:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-16 22:22:35 -0700 |
| commit | af5260ee785b8418c7319a84b1d1a0d26e770ed0 (patch) | |
| tree | bf59305e92736220fdf3fc178fa80d07d909ed97 | |
| parent | [PATCH] Improve handling of "." and ".." in git-diff-* (diff) | |
| download | tgif-af5260ee785b8418c7319a84b1d1a0d26e770ed0.tar.xz | |
git-format-patch fixes.
Introduces --keep-subjects flag to tell it not to munge the
first line of the commit message. Running "git applymbox" on
the output from "git format-patch -m -k" would preserve the
original commit information better this way.
At the same time, prefix Subject: on the first line of the
commit, to help people cut©.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-format-patch-script | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/git-format-patch-script b/git-format-patch-script index 78bb089542..3c3413b76f 100755 --- a/git-format-patch-script +++ b/git-format-patch-script @@ -6,7 +6,7 @@ . git-sh-setup-script || die "Not a git archive." usage () { - echo >&2 "usage: $0"' [-n] [-o dir] [--mbox] [--check] [--signoff] [-<diff options>...] upstream [ our-head ] + echo >&2 "usage: $0"' [-n] [-o dir] [--keep-subject] [--mbox] [--check] [--signoff] [-<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 @@ -44,6 +44,9 @@ do date=t ;; -m|--m|--mb|--mbo|--mbox) date=t author=t mbox=t ;; + -k|--k|--ke|--kee|--keep|--keep-|--keep-s|--keep-su|--keep-sub|\ + --keep-subj|--keep-subje|--keep-subjec|--keep-subject) + keep_subject=t ;; -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered) numbered=t ;; -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) @@ -64,6 +67,11 @@ do shift done +case "$keep_subject$numbered" in +tt) + die '--keep-subject and --numbered are incompatible.' ;; +esac + revpair= case "$#" in 2) @@ -142,21 +150,22 @@ do { mailScript=' /./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"'] |' - ;; + /^$/n' + case "$keep_subject" in + t) ;; *) mailScript="$mailScript"' + s|^\[PATCH[^]]*\] *|| s|^|[PATCH'"$num"'] |' ;; esac - + mailScript="$mailScript"' + s|^|Subject: |' + case "$mbox" in + t) + echo 'From nobody Mon Sep 17 00:00:00 2001' ;# UNIX "From" line + ;; + esac eval "$(sed -ne "$whosepatchScript" $commsg)" test "$author,$au" = ",$me" || { mailScript="$mailScript"' |