cg-commit: fix signed off handling
PATCH 1/1 cg-commit: fix signed off handling
Handle the sign off insertion before starting the CG: comment lines. Also, fix typo in grepping for existing sign off lines.
---
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.
cg-commit | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)
cg-commit +4 -8
@@ -406,12 +406,10 @@ # Always have at least one blank line, t # 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 - echo "Signed-off-by: $signoff" - fi >> $LOGMSG -} +if [ "$signoff" ] && ! grep -q -i "signed-off-by: $signoff" $LOGMSG; then + grep -q -i signed-off-by $LOGMSG || echo + echo "Signed-off-by: $signoff" +fi >> $LOGMSG # CG: ----------------------------------------------------------------------- editor_comment_start commit
@@ -472,7 +470,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"
@@ -503,7 +500,6 @@ __END__ editor_parse_setif GIT_AUTHOR_DATE Date else cat >>"$LOGMSG2" - add_signoff fi if [ ! "$review" ]; then
Signature · 1 line
Jonas Fonseca
Dear diary, on Fri, Aug 25, 2006 at 02:27:40AM CEST, I got a letter where Jonas Fonseca <[email protected]> said that...
Quoted 9 lines
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 <[email protected]>---
The late calling of the
add_signofffunction 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 <[email protected]> Thu, 20 Jul 2006 11:37:31 -0400
* cg-commit:
Add signoff past the message if getting it from stdin
What about this?
cg-commit +10 -5
@@ -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"
Signature · 5 lines
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*',/((..)*)$/)Petr Baudis <[email protected]> wrote Sun, Sep 24, 2006:
Quoted 14 lines
Dear diary, on Fri, Aug 25, 2006 at 02:27:40AM CEST, I got a letter where Jonas Fonseca <[email protected]> said that...
Quoted 9 lines
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 <[email protected]>---
The late calling of the
add_signofffunction 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
Quoted 8 lines
Commit:
4cf220db10c0b937f9852513effc5565fcbb4f86
Author: Petr Baudis <[email protected]> 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. :)
Quoted 5 lines
cg-commit +0
-0
cg-commit if [ "$msgfile" ]; then · line 407
Quoted 10 lines
cg-commit +0
-4@@ -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".
Signature · 1 line
Jonas Fonseca
Dear diary, on Sun, Sep 24, 2006 at 08:32:46PM CEST, I got a letter where Jonas Fonseca <[email protected]> said that...
Quoted 18 lines
Petr Baudis <[email protected]> wrote Sun, Sep 24, 2006:
Quoted 5 lines
cg-commit +0
-0cg-commit if [ "$msgfile" ]; then · line 407
Quoted 10 lines
cg-commit +0
-4@@ -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^^^^^^^^^^^
Quoted 1 line
My patch also fixed this to grep for "signed-off-by".
Oh, thanks - fixed.
Signature · 5 lines
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*',/((..)*)$/)