summaryrefslogtreecommitdiff
path: root/git-format-patch-script
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-08-16 00:20:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-16 00:44:16 (GMT)
commitd9ac9df41c8c1c3a2f5b0fb1bcc0546dc1bafba2 (patch)
tree487528ac75fd6d22bb3e77496dd440feee52d1a6 /git-format-patch-script
parent2150cc99fe29fd81db1e9c5971e13bcb78373ebf (diff)
downloadgit-d9ac9df41c8c1c3a2f5b0fb1bcc0546dc1bafba2.zip
git-d9ac9df41c8c1c3a2f5b0fb1bcc0546dc1bafba2.tar.gz
git-d9ac9df41c8c1c3a2f5b0fb1bcc0546dc1bafba2.tar.bz2
[PATCH] Make git-format-patch's signoff option more consistent
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>
Diffstat (limited to 'git-format-patch-script')
-rwxr-xr-xgit-format-patch-script13
1 files changed, 8 insertions, 5 deletions
diff --git a/git-format-patch-script b/git-format-patch-script
index ebe6616..78bb089 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 '---'