Dear diary, on Fri, Aug 25, 2006 at 02:27:40AM CEST, I got a letter
where Jonas Fonseca <fonseca@xxxxxxx> said that...
> Handle the sign off insertion before starting the CG: comment lines. Also,
> fix typo in grepping for existing sign off lines.
>
> Signed-off-by: Jonas Fonseca <fonseca@xxxxxxx>
> ---
>
> The late calling of the add_signoff function has multiple problems,
> since at that point comment lines has already been added and the sign
> off line will end up in only one of the log message files.
Well, the commit that moved this was
Commit: 4cf220db10c0b937f9852513effc5565fcbb4f86
Author: Petr Baudis <pasky@xxxxxxxxxxxxx> Thu, 20 Jul 2006 11:37:31 -0400
* cg-commit:
Add signoff past the message if getting it from stdin
What about this?
diff --git a/cg-commit b/cg-commit
index 43e6c6c..beedb6f 100755
--- a/cg-commit
+++ b/cg-commit
@@ -402,10 +402,6 @@ if [ "$msgfile" ]; then
written=1
fi
-# Always have at least one blank line, to ease the editing for
-# the poor people whose text editor has no 'O' command.
-[ "$written" ] || { tty -s && echo >>"$LOGMSG"; }
-
add_signoff() {
if [ "$signoff" ] && ! grep -q -i "signed-off-by: $signoff" $LOGMSG; then
grep -q -i sign-off-by $LOGMSG || echo
@@ -413,6 +409,16 @@ add_signoff() {
fi >> $LOGMSG
}
+if tty -s; then
+ # Always have at least one blank line, to ease the editing for
+ # the poor people whose text editor has no 'O' command.
+ [ "$written" ] || echo >>"$LOGMSG"
+ # Also, add the signoff line _now_ before spewing out CG: lines.
+ # (In case of non-tty input we do it later after taking the actual
+ # log message from stdin.)
+ add_signoff
+fi
+
# CG: -----------------------------------------------------------------------
editor_comment_start commit
@@ -472,7 +478,6 @@ editor_msg_end
cp "$LOGMSG" "$LOGMSG2"
if tty -s; then
- add_signoff
if [ "$editor" ] && ! editor $commitalways commit c; then
rm "$LOGMSG" "$LOGMSG2"
[ "$review" ] && rm "$PATCH"
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html