git - How do I allow merge commits without a "Bug nnn" reference past gitzilla's hooks -
i have bugzilla , gitzilla set defined on gitzilla home page (http://www.theoldmonk.net/gitzilla/) default post-receive , update hooks. when push commits appropriate "bug nnn"-like regexes works fine. problem have mark of merge commits similar regex or rejected gitzilla hooks:
remote: ====================================================================== remote: cannot accept commit. remote: remote: no bug ref found in commit:
if updated merge commit contain reference bug in bugzilla push succeeds. unfortunately, though merge commits tagged bug reference, bug in bugzilla isn't updated commit.
so, think there 2 options fixing problem. option i'd able change in hook don't need "bug nnn" reference on merge commits. if that's not do-able, second best option update bug in bugzilla named in merge commit.
you add --no-merges
option hook here:
https://github.com/gera/gitzilla/blob/master/utils.py#l76
change this:
ascommand = ['git', scommand, "--no-merges", "--format=format:%s%s" % (sseparator, sformatspec)]
as utility function, may used others checks (don't know), take account when changing it.
Comments
Post a Comment