Commit: fd555bb040c8ea3d3ddf719315194bdf66e30a77 Author: Alexander Moskaliov <ir...@php.net> Fri, 30 Mar 2012 17:18:54 +0400 Parents: c059938d0d11b3c28b242f294c532484a15c826c Branches: master
Link: http://git.php.net/?p=karma.git;a=commitdiff;h=fd555bb040c8ea3d3ddf719315194bdf66e30a77 Log: fix reject for empty paths while trivial merge Changed paths: M hooks/pre-receive Diff: fd555bb040c8ea3d3ddf719315194bdf66e30a77 diff --git a/hooks/pre-receive b/hooks/pre-receive index 02789e9..b23fb2c 100755 --- a/hooks/pre-receive +++ b/hooks/pre-receive @@ -118,7 +118,7 @@ $pi = new \Git\PushInformation($hook); $req_paths = ($pi->isNewBranch() || $pi->isForced() || $pi->isTag()) ? [''] : $hook->getReceivedPaths(); if (empty($req_paths)) { - deny("We cannot figure out what you comitted!"); + $req_paths = ['']; // we can empty paths for trivial merge } $prefix = sprintf('%s/', $repo_name); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
