gnunet

commit 2652a92f5417b38e059e4d24ace9fb7328e0abdb
parent d3d994d338667d4bc263c8a6832cb592d678422f
Author: t3sserakt <t3ss@posteo.de>
Date:   Fri, 27 Jan 2023 13:15:19 +0100

Merge branch 'master' of ssh://git.gnunet.org/gnunet

Diffstat:
A
ChangeLog
 | 
2
++
M
contrib/conf/commit-msg
 | 
6
+++---
M
contrib/conf/prepare-commit-msg
 | 
4
+---

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1,2 @@
+ Please look at the git log.
+ If this is a tarball the git log can be found online at https://git.gnunet.org/gnunet.git/log/.
diff --git 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
@@ -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