You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/04 08:24:41 UTC

[07/19] incubator-weex git commit: [WEEX-74] Added Jira issue number as commit log title

[WEEX-74] Added Jira issue number as commit log title

As Apache Jira provides the function that can automatically connect
commit and Jira issue according to the issue number with specific
format, so added a new way in commit message title check regex to
allow this.

Removed the Merge title because we are not going to allow merge
and start to follow the rebase way.

Also updated error message to point to the correct URL.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1d2d39aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1d2d39aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1d2d39aa

Branch: refs/heads/release-0.16
Commit: 1d2d39aa63d21b1b82e6897100ca5dd498af6064
Parents: fd58942
Author: Jonathan Dong <do...@aliyun.com>
Authored: Wed Sep 27 23:18:51 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Wed Oct 4 16:21:38 2017 +0800

----------------------------------------------------------------------
 scripts/commit-msg.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d2d39aa/scripts/commit-msg.sh
----------------------------------------------------------------------
diff --git a/scripts/commit-msg.sh b/scripts/commit-msg.sh
index ff1a967..3a767cb 100755
--- a/scripts/commit-msg.sh
+++ b/scripts/commit-msg.sh
@@ -17,11 +17,11 @@
 # under the License.
 
 # Validate commit log
-commit_regex='^Merge.+|[+*-] \[(android|ios|jsfm|html5|component|doc|build|website|example|test|all)\] .{1,50}'
+commit_regex='[+*-] \[(android|ios|jsfm|html5|component|doc|build|website|example|test|all)\] .{1,50}|\[WEEX-[0-9]*\] .{1,50}'
 
 if ! grep -iqE "$commit_regex" "$1"; then
-    echo "ERROR: commit log format is not correct!"
-    echo "See https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#commit-log"
+    echo "ERROR: Incorrect commit log format, please refer to:"
+    echo "https://github.com/apache/incubator-weex/blob/master/CONTRIBUTING.md#commit-log"
     exit 1
 fi
 # FIXME no effect after editor (like vim) exits