Alexandre Julliard : patches: Improve filtering of non-git patches that only add new files.
Alexandre Julliard
julliard at winehq.org
Fri Feb 12 10:15:44 CST 2010
Module: tools
Branch: master
Commit: 68935fce5551c6e75b2839afb2c8ddbd3da66afa
URL: http://source.winehq.org/git/tools.git/?a=commit;h=68935fce5551c6e75b2839afb2c8ddbd3da66afa
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 12 17:15:14 2010 +0100
patches: Improve filtering of non-git patches that only add new files.
---
patches/filter | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/patches/filter b/patches/filter
index 747f719..8a9bf9c 100755
--- a/patches/filter
+++ b/patches/filter
@@ -40,6 +40,7 @@ sub find_p_option(@)
while ($a[$ret] ne $b[$ret]) { $ret++; }
return $ret;
}
+ return 0;
}
sub add_prefix($$$)
@@ -66,6 +67,7 @@ sub filter_patch(@)
if (/^Index: (\S*)/) { $use_index = 1; }
elsif (/^\+\+\+ b\//) { $p_option = 1; }
elsif (/^diff --git/) { $p_option = 1; }
+ elsif (/ (\/dev\/null)/) { push @diff_lines, $1; }
elsif (/^--- (\S*)\//) { push @diff_lines, $1; }
elsif (/^\+\+\+ (\S*)\//) { push @diff_lines, $1; }
}
More information about the wine-cvs
mailing list