com karma: Check for trivial merge based on the paths array: lib/Git/PostReceiveHook.php
| From: | David Soria Parra | Date: | Sat, 24 Mar 2012 08:30:20 +0000 |
| Subject: | com karma: Check for trivial merge based on the paths array: lib/Git/PostReceiveHook.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68169@lists.php.net to get a copy of this message | ||
Commit: deed69a3a56adc67972a0f8795eeb539b7d8d6cb
Author: David Soria Parra <dsp@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) {