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.
cg-commit | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/cg-commit b/cg-commit
index 5cebd81..b0b5c34 100755
--- a/cg-commit
+++ b/cg-commit
@@ -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
--
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