rapid7/metasploit-framework — pull request #3188 by todb-r7 (2014-04-03 20:36:20+00:00)
Title: Allow msftidy to run as a post-merge hook

This should solve the merge problem where msftidy-failing modules still sneaks into the tree.

## Verification steps

- [ ] Check out this feature branch.
- [ ] Create a temp branch: `git checkout -b temp-8779`
- [ ] `git remote add -f todb-r7git://github.com/todb-r7/metasploit-framework.git`
- [ ] `git merge origin/bug/8779-intentionally-bad-module`
- [ ] Amaze at the error message.
- [ ] Checkout this feature branch again (iow get out of `temp-8779`)
- [ ] Land this pull request.

After this lands, Travis should also be able to deal with merges that contain msftidy-failing modules. See here:

https://travis-ci.org/todb-r7/metasploit-framework/builds/22202066

More could be done with the post-merge hook, of course. Namely, we'll want to (pretty soon) also warn about crappy merge messages that aren't following [50/72 formatting](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), or even start complaining about unsigned merges. Won't that be the day!