From 29ba85c53e56c934f4d94c5e668e4da0ed31191a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 16 Apr 2014 16:32:39 +0000 Subject: [PATCH] Fix application of patch files created with `git diff --no-prefix --relative .` git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1659 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/patch_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patch_util.py b/tools/patch_util.py index 0d6c5bf00..700884bc0 100644 --- a/tools/patch_util.py +++ b/tools/patch_util.py @@ -220,7 +220,7 @@ class PatchInfo(object): filenames = False header = True else: - self.source.append(match.group(1)) + self.source.append(match.group(1).strip()) elif not line.startswith("+++ "): if nextfileno in self.source: warning("skipping invalid patch with no target for %s" % self.source[nextfileno])