[gnunet] branch master updated: git: Do not add text templates to git messages, only policy infos.

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new dc2d36c98 git: Do not add text templates to git messages, only policy 
infos.
dc2d36c98 is described below

commit dc2d36c982d0313f9a6905be9f31bd8c9dfc69e1
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Jan 20 12:38:16 2023 +0900

    git: Do not add text templates to git messages, only policy infos.
---
 contrib/conf/commit-msg         | 6 +++---
 contrib/conf/prepare-commit-msg | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/contrib/conf/commit-msg b/contrib/conf/commit-msg
index f6e73d5cc..cc532921c 100755
--- a/contrib/conf/commit-msg
+++ b/contrib/conf/commit-msg
@@ -15,7 +15,7 @@ do
  if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
  then
    RET=1
-   # Check if it has a ChangeLog line
+   # Check if it has a NEWS line
    if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null
    then
        RET=0
@@ -24,10 +24,10 @@ do
  fi
 done
 
-# If no ChangeLog line found, abort
+# If no NEWS line found, abort
 if [ $RET = 1 ];
 then
-  echo "Your commit includes staged changes that indicate an API change which 
requires a ChangeLog line."
+  echo "Your commit includes staged changes that indicate an API change which 
requires a NEWS line."
 else
   echo "Your commit does not include API changes"
 fi
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
index 0266f5558..8acca9e38 100755
--- a/contrib/conf/prepare-commit-msg
+++ b/contrib/conf/prepare-commit-msg
@@ -27,12 +27,10 @@ done
 if [ -z "$COMMIT_SOURCE" ];
 then
   hint=$(cat "$COMMIT_MSG_FILE")
-  echo ": Fixes #" > "$COMMIT_MSG_FILE"
   echo -e "# Our commit subject format policy is:\n# <subsystem>: 
<description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will 
automatically update/resolve issue #1234 in mantis." >> "$COMMIT_MSG_FILE"
   if [ $RET = 1 ];
   then
-    echo -e "\n# Your commit includes staged changes that indicate an API 
change which requires a ChangeLog line." >> "$COMMIT_MSG_FILE"
-    echo "NEWS: " >> "$COMMIT_MSG_FILE"
+    echo -e "# Your commit includes staged changes that indicate an API change 
which requires a NEWS line." >> "$COMMIT_MSG_FILE"
   fi
   echo "$hint" >> "$COMMIT_MSG_FILE"
 fi

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.