[libvirt] merge-commit push prohibition now in place, for master

Just today we noticed that it was possible to push accidental merge commits to "master". While the commit hook to prevent that was in place, the config setting to enable the hook for "master" was missing. I've just done this on the server: git --git-dir /git/libvirt.git config hooks.denymerge.master true so *now*, we should be protected from ourselves.

On Mon, Sep 07, 2009 at 05:06:51PM +0200, Jim Meyering wrote:
Just today we noticed that it was possible to push accidental merge commits to "master". While the commit hook to prevent that was in place, the config setting to enable the hook for "master" was missing. I've just done this on the server:
git --git-dir /git/libvirt.git config hooks.denymerge.master true
so *now*, we should be protected from ourselves.
The ourselves being me, I goofed when pushing Mathias patch earlier today I didn't noticed I had applied to a branch which hadn't been rebased :-\ and pulled/pushed that ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (2)
-
Daniel Veillard
-
Jim Meyering