diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-16 12:13:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-16 12:13:16 -0700 |
| commit | 1f40c7c24d999675df818f9d7824937a964f9f40 (patch) | |
| tree | 7918cb1acd31a6be7b122cd4bc2e873f5b333b36 /git-format-patch-script | |
| parent | 14fb44880c1143ae0259842c808c036e78b516f6 (diff) | |
| parent | abe0582207c72ec848e78707577c61a98f5c633d (diff) | |
Merge with master changes.
Diffstat (limited to 'git-format-patch-script')
| -rwxr-xr-x | git-format-patch-script | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/git-format-patch-script b/git-format-patch-script index ebe6616494..78bb089542 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] [--sign] [-<diff options>...] upstream [ our-head ] + echo >&2 "usage: $0"' [-n] [-o dir] [--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 @@ -46,7 +46,7 @@ do date=t author=t mbox=t ;; -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered) numbered=t ;; - -s|--s|--si|--sig|--sign) + -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) signoff=t ;; -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\ --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\ @@ -179,9 +179,12 @@ Date: '"$ad" test "$signoff" = "t" && { offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'` - echo - echo "Signed-off-by: $offsigner" - echo + line="Signed-off-by: $offsigner" + grep -q "^$line\$" $commsg || { + echo + echo "$line" + echo + } } echo '---' |