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

Ignore pseudo diff stanzas which mention binary files.

Browse Source
This commit is contained in:
Thomas Keller 2010-10-06 21:37:53 +00:00
parent 97ea828532
commit 4951498c0b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/IDF/Diff.php
View File

@ -72,6 +72,9 @@ class IDF_Diff
$indiff = true; $indiff = true;
continue; continue;
} else if (0 === strpos($line, '=========')) { } else if (0 === strpos($line, '=========')) {
// ignore pseudo stanzas with a hint of a binary file
if (preg_match("/^# (.+) is binary/", $this->lines[$i]))
continue;
// by default always use the new name of a possibly renamed file // by default always use the new name of a possibly renamed file
$current_file = self::getMtnFile($this->lines[$i+1]); $current_file = self::getMtnFile($this->lines[$i+1]);
// mtn 0.48 and newer set /dev/null as file path for dropped files // mtn 0.48 and newer set /dev/null as file path for dropped files