Repository: incubator-weex Updated Branches: refs/heads/master 717913371 -> 634c6413c
[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/634c6413 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/634c6413 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/634c6413 Branch: refs/heads/master Commit: 634c6413c1e715cb3174b1b039198f339df25736 Parents: 7179133 Author: Jonathan Dong <dong....@aliyun.com> Authored: Wed Sep 27 23:18:51 2017 +0800 Committer: Jonathan Dong <dong....@aliyun.com> Committed: Wed Sep 27 23:48:01 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/634c6413/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