Indefero Commit Details

Date:

2011-10-08 17:08:16 (14 years 1 month ago)

Author:

Thomas Keller

Branch:

develop, feature.diff-whitespace, feature.wiki-default-page, release-1.2, release-1.3

Commit:

c84afd0f783537a5255ed2637568f242e0356640

Parents:

b1276dff6cc8eb9767e11e2aecbf22dcaea3a461

Message:

Some git diffs (most likely octopus merges) start with diff --cc, so we have to detect and stop log parsing when this occurs as well.

Changes:

File differences

-513
514 514
515 515
516 
516
517
518
519
520
517 521
518 522
519 523
+            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 = '';␊
        if ($diffStart !== false) {␊
            $log = substr($out, 0, $diffStart);␊
             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 = '';␊
         if ($diffStart !== false) {␊
             $log = substr($out, 0, $diffStart);␊