com karma: Omitting uninteresting hunks in merge commit diff: lib/Git/PostReceiveHook.php

Commit: 410216d61c4f23d552e87741161844685e640b87 Author: Alexander Moskaliov <irker@php.net> Sat, 31 Mar 2012 21:41:35 +0400 Parents: fd555bb040c8ea3d3ddf719315194bdf66e30a77 Branches: master Link: http://git.php.net/?p=karma.git;a=commitdiff;h=410216d61c4f23d552e87741161844685e640b87 Log: Omitting uninteresting hunks in merge commit diff Changed paths: M lib/Git/PostReceiveHook.php Diff: 410216d61c4f23d552e87741161844685e640b87 diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php index a7436bd..f524fa6 100644 --- a/lib/Git/PostReceiveHook.php +++ b/lib/Git/PostReceiveHook.php @@ -515,7 +515,7 @@ class PostReceiveHook extends ReceiveHook $info = $this->getCommitInfo($revision); - $diff = \Git::gitExec('diff-tree -c -p %s', escapeshellarg($revision)); + $diff = \Git::gitExec('diff-tree --cc -r --no-commit-id %s', escapeshellarg($revision)); $mail = new \Mail(); $mail->setSubject($this->emailPrefix . 'com ' . $this->getRepositoryShortName() . ': ' . $info['subject'] . ': '. implode(' ', array_keys($paths)));