Indefero Commit Details

Date:

2010-10-06 16:37:53 (14 years 2 months ago)

Author:

Thomas Keller

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

4951498c0b1e3480effb132468ff134ad35efc40

Parents:

97ea828532c564563fcd7ac45551befb1fa4cd98

Message:

Ignore pseudo diff stanzas which mention binary files.

Changes:

File differences

-72
73 73
74 74
75
76
77
75 78
76 79
77 80
+                $indiff = true;␊
                continue;␊
            } 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␊
                $current_file = self::getMtnFile($this->lines[$i+1]);␊
                // mtn 0.48 and newer set /dev/null as file path for dropped files␊
                 $indiff = true;␊
                 continue;␊
             } 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␊
                 $current_file = self::getMtnFile($this->lines[$i+1]);␊
                 // mtn 0.48 and newer set /dev/null as file path for dropped files␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags