Petr Baudis <pasky@xxxxxxx> wrote Sun, Sep 24, 2006:
> 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?
The thing you committed seems to work, so I am happy again. :)
> 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
^^^^^^^^^^^
My patch also fixed this to grep for "signed-off-by".
--
Jonas Fonseca
-
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