Commit: deed69a3a56adc67972a0f8795eeb539b7d8d6cb Author: David Soria Parra <d...@php.net> Sat, 24 Mar 2012 09:30:20 +0100 Parents: b2c216852c420a55da06830e3d80759961875815 Branches: master
Link: http://git.php.net/?p=karma.git;a=commitdiff;h=deed69a3a56adc67972a0f8795eeb539b7d8d6cb Log: Check for trivial merge based on the paths array Changed paths: M lib/Git/PostReceiveHook.php Diff: deed69a3a56adc67972a0f8795eeb539b7d8d6cb diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php index 2a54abc..a7436bd 100644 --- a/lib/Git/PostReceiveHook.php +++ b/lib/Git/PostReceiveHook.php @@ -502,7 +502,7 @@ class PostReceiveHook extends ReceiveHook $pathsString .= ' ' . $action . ' ' . $path . "\n"; } - $isTrivialMerge = empty($pathsString); + $isTrivialMerge = count($paths) <= 0; if (!$isTrivialMerge) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
