Re: [Spacewalk-devel] Re: Merge branch 'master' of ssh://jlsherr...@git.fedorahosted.org/git/spacewalk
On Thu, Mar 12, 2009 at 07:27:19AM +0100, Jan Pazdziora wrote: On Wed, Mar 11, 2009 at 08:09:49PM -0700, Mike McCune wrote: http://git.fedorahosted.org/git/?p=spacewalk.git;a=commitdiff;h=6c1be4e0cc992afb834e8fedf7c3094746466ba4 'git pull --rebase' next time? It should be possible to do a post commit hook to refuse commits which introduce merges that have the default commit message (= likely not intended merge). Is this something we might want to try setting up? We should also be able to try to enforce the ^((\d+)\s-\s)? format for bugzilla numbers. -- Jan Pazdziora | adelton at #satellite*, #brno Satellite Engineering, Red Hat ___ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
Re: [Spacewalk-devel] Re: Merge branch 'master' of ssh://jlsherr...@git.fedorahosted.org/git/spacewalk
On Thu, Mar 12, 2009 at 09:17:34AM -0300, Devan Goodwin wrote: Would like too, only reason not too I can think of is if you'd done some package tagging and intentionally done a pull without --rebase so as not to have to redo it. In that case you probably should --amend the commit to say why you did that merge. In which case the regexp will no longer match and you'll be OK. -- Jan Pazdziora Satellite Engineering, Red Hat ___ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
Re: [Spacewalk-devel] Re: Merge branch 'master' of ssh://jlsherr...@git.fedorahosted.org/git/spacewalk
Jan Pazdziora wrote: % On Thu, Mar 12, 2009 at 07:27:19AM +0100, Jan Pazdziora wrote: % On Wed, Mar 11, 2009 at 08:09:49PM -0700, Mike McCune wrote: % http://git.fedorahosted.org/git/?p=spacewalk.git;a=commitdiff;h=6c1be4e0cc992afb834e8fedf7c3094746466ba4 % % 'git pull --rebase' next time? % % It should be possible to do a post commit hook to refuse commits % which introduce merges that have the default commit message (= likely % not intended merge). % % Is this something we might want to try setting up? % % We should also be able to try to enforce the % % ^((\d+)\s-\s)? % % format for bugzilla numbers. I agree with commit hooks. Anyway format bugzilla numbers is more complicated (multiple bz numbers or none). -- Michael Mráka Satellite Engineering, Red Hat ___ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
Re: [Spacewalk-devel] Re: Merge branch 'master' of ssh://jlsherr...@git.fedorahosted.org/git/spacewalk
2009/3/12 Michael Mraka michael.mr...@redhat.com: Jan Pazdziora wrote: % On Thu, Mar 12, 2009 at 07:27:19AM +0100, Jan Pazdziora wrote: % On Wed, Mar 11, 2009 at 08:09:49PM -0700, Mike McCune wrote: % http://git.fedorahosted.org/git/?p=spacewalk.git;a=commitdiff;h=6c1be4e0cc992afb834e8fedf7c3094746466ba4 % % 'git pull --rebase' next time? % % It should be possible to do a post commit hook to refuse commits % which introduce merges that have the default commit message (= likely % not intended merge). % % Is this something we might want to try setting up? % % We should also be able to try to enforce the % % ^((\d+)\s-\s)? % % format for bugzilla numbers. I agree with commit hooks. Anyway format bugzilla numbers is more complicated (multiple bz numbers or none). +1 to the enforcement. Sounds like a good idea. Agreed with Michael here that the commit message, my regex sucks but I'll try to at least describe it :) \d*(,\d*) - msg so you can have 0 or more bugzilla numbers separated by commas. The list of bugzilla numbers is set apart from the msg by a space hyphen space, then followed by a commit message. If there is no bugzilla number there should be no hyphen. jesus ___ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
Re: [Spacewalk-devel] Re: Merge branch 'master' of ssh://jlsherr...@git.fedorahosted.org/git/spacewalk
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jesus M. Rodriguez wrote: 2009/3/12 Michael Mraka michael.mr...@redhat.com: Jan Pazdziora wrote: % On Thu, Mar 12, 2009 at 07:27:19AM +0100, Jan Pazdziora wrote: % On Wed, Mar 11, 2009 at 08:09:49PM -0700, Mike McCune wrote: % http://git.fedorahosted.org/git/?p=spacewalk.git;a=commitdiff;h=6c1be4e0cc992afb834e8fedf7c3094746466ba4 % % 'git pull --rebase' next time? % % It should be possible to do a post commit hook to refuse commits % which introduce merges that have the default commit message (= likely % not intended merge). % % Is this something we might want to try setting up? % % We should also be able to try to enforce the % % ^((\d+)\s-\s)? % % format for bugzilla numbers. I agree with commit hooks. Anyway format bugzilla numbers is more complicated (multiple bz numbers or none). +1 to the enforcement. Sounds like a good idea. Agreed with Michael here that the commit message, my regex sucks but I'll try to at least describe it :) \d*(,\d*) - msg so you can have 0 or more bugzilla numbers separated by commas. The list of bugzilla numbers is set apart from the msg by a space hyphen space, then followed by a commit message. If there is no bugzilla number there should be no hyphen. jesus You just had to bait the perl guys didn't you? ;) I think what you meant is: (\d+(,\d+)*\ \-\ )?.+ and as can be seen on my cube wall: http://xkcd.com/208/ Thanks. Brandon -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with Red Hat - http://enigmail.mozdev.org iD8DBQFJucw2hwQhj8l1t/cRAj3wAKCjc1kRnnULFUcv0vLhtHmtsc/+ZACdFvYW zbXQy+dwnwzZZj1k/m8M0qM= =dCxK -END PGP SIGNATURE- ___ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
[Spacewalk-devel] Re: Merge branch 'master' of ssh://jlsherr...@git.fedorahosted.org/git/spacewalk
http://git.fedorahosted.org/git/?p=spacewalk.git;a=commitdiff;h=6c1be4e0cc992afb834e8fedf7c3094746466ba4 'git pull --rebase' next time? -- Mike McCune mmccune AT redhat.com Engineering | Portland, OR RHN Satellite | 650.567.9039x79248 ___ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
