natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some git diffs (most likely octopus merges) start with diff --cc,

Browse Source 
so we have to detect and stop log parsing when this occurs as well.
This commit is contained in:
Thomas Keller 2011-10-09 00:08:16 +02:00
parent b1276dff6c
commit c84afd0f78
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/IDF/Scm/Git.php
View File

@ -513,7 +513,11 @@ class IDF_Scm_Git extends IDF_Scm
return false; return false;
} }
$diffStart = strpos($out, 'diff --git a'); $diffStart = false;
if (preg_match('/^diff (?:--git a|--cc)/m', $out, $m, PREG_OFFSET_CAPTURE)) {
$diffStart = $m[0][1];
}
$diff = ''; $diff = '';
if ($diffStart !== false) { if ($diffStart !== false) {
$log = substr($out, 0, $diffStart); $log = substr($out, 0, $diffStart);