undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Make git-format-patch's signoff option more consistent

Browse Source 
Since git-commit-script has a "--signoff" option, use that in
git-format-patch-script, too (and since partial option names are
supported,"--sign" is still valid).

Also, if the message already contains the S-O-B line, silently ignore the
"--signoff" request.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2005-08-16 02:20:34 +02:00 committed by Junio C Hamano
parent 2150cc99fe
commit d9ac9df41c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git-format-patch-script
View File

@ -6,7 +6,7 @@
. git-sh-setup-script || die "Not a git archive." . git-sh-setup-script || die "Not a git archive."
usage () { 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, Prepare each commit with its patch since our-head forked from upstream,
one file per patch, for e-mail submission. Each output file is one file per patch, for e-mail submission. Each output file is
@ -46,7 +46,7 @@ do
date=t author=t mbox=t ;; date=t author=t mbox=t ;;
-n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered) -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
numbered=t ;; numbered=t ;;
-s|--s|--si|--sig|--sign) -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
signoff=t ;; signoff=t ;;
-o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\ -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\
--output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\ --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\
@ -179,9 +179,12 @@ Date: '"$ad"
test "$signoff" = "t" && { test "$signoff" = "t" && {
offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'` offsigner=`git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`
echo line="Signed-off-by: $offsigner"
echo "Signed-off-by: $offsigner" grep -q "^$line\$" $commsg || {
echo echo
echo "$line"
echo
}
} }
echo '---' echo '---'