diff options
Diffstat (limited to 'contrib/conf')
-rwxr-xr-x | contrib/conf/commit-msg | 6 | ||||
-rwxr-xr-x | 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 | |||
15 | if echo $f | grep \src\/include\/.\*\.h\$ > /dev/null | 15 | if echo $f | grep \src\/include\/.\*\.h\$ > /dev/null |
16 | then | 16 | then |
17 | RET=1 | 17 | RET=1 |
18 | # Check if it has a ChangeLog line | 18 | # Check if it has a NEWS line |
19 | if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null | 19 | if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null |
20 | then | 20 | then |
21 | RET=0 | 21 | RET=0 |
@@ -24,10 +24,10 @@ do | |||
24 | fi | 24 | fi |
25 | done | 25 | done |
26 | 26 | ||
27 | # If no ChangeLog line found, abort | 27 | # If no NEWS line found, abort |
28 | if [ $RET = 1 ]; | 28 | if [ $RET = 1 ]; |
29 | then | 29 | then |
30 | echo "Your commit includes staged changes that indicate an API change which requires a ChangeLog line." | 30 | echo "Your commit includes staged changes that indicate an API change which requires a NEWS line." |
31 | else | 31 | else |
32 | echo "Your commit does not include API changes" | 32 | echo "Your commit does not include API changes" |
33 | fi | 33 | 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 | |||
27 | if [ -z "$COMMIT_SOURCE" ]; | 27 | if [ -z "$COMMIT_SOURCE" ]; |
28 | then | 28 | then |
29 | hint=$(cat "$COMMIT_MSG_FILE") | 29 | hint=$(cat "$COMMIT_MSG_FILE") |
30 | echo ": Fixes #" > "$COMMIT_MSG_FILE" | ||
31 | 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" | 30 | 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" |
32 | if [ $RET = 1 ]; | 31 | if [ $RET = 1 ]; |
33 | then | 32 | then |
34 | echo -e "\n# Your commit includes staged changes that indicate an API change which requires a ChangeLog line." >> "$COMMIT_MSG_FILE" | 33 | echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE" |
35 | echo "NEWS: " >> "$COMMIT_MSG_FILE" | ||
36 | fi | 34 | fi |
37 | echo "$hint" >> "$COMMIT_MSG_FILE" | 35 | echo "$hint" >> "$COMMIT_MSG_FILE" |
38 | fi | 36 | fi |