Commit: 11bc19461cfada676edd5852edc529532ef7a3ac Author: Alexander Moskaliov(ir...@php.net) Tue, 20 Mar 2012 11:36:28 +0400 Committer: Alexander Moskaliov(ir...@php.net) Tue, 20 Mar 2012 11:36:28 +0400 Parents: 9c54157ce5bcc8e2a414014ddd234efedd8d135c
Link: http://git.php.net/?p=karma.git;a=commitdiff;h=11bc19461cfada676edd5852edc529532ef7a3ac Log: Add trivial merge. For merge commits without change any files (trivial merge) we not show changes path and diff in mail Changed paths: M lib/Git/PostReceiveHook.php Diff: 11bc19461cfada676edd5852edc529532ef7a3ac diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php index da755f4..ee3aab7 100644 --- a/lib/Git/PostReceiveHook.php +++ b/lib/Git/PostReceiveHook.php @@ -518,7 +518,9 @@ class PostReceiveHook extends ReceiveHook } - if (strlen($pathsString) < 8192) { + if ($pathsString == '') { + $message .= "\nTrivial merge\n"; + } elseif (strlen($pathsString) < 8192) { // inline changed paths $message .= "\nChanged paths:\n" . $pathsString . "\n"; if ((strlen($pathsString) + strlen($diff)) < 8192) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
