summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/patch.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 05e0faa5b7..c04f098712 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -317,6 +317,7 @@ class GitApplyTree(PatchTree):
317 def interpretPatchHeader(headerlines): 317 def interpretPatchHeader(headerlines):
318 import re 318 import re
319 author_re = re.compile('[\S ]+ <\S+@\S+\.\S+>') 319 author_re = re.compile('[\S ]+ <\S+@\S+\.\S+>')
320 from_commit_re = re.compile('^From [a-z0-9]{40} .*')
320 outlines = [] 321 outlines = []
321 author = None 322 author = None
322 date = None 323 date = None
@@ -346,6 +347,9 @@ class GitApplyTree(PatchTree):
346 # git is fussy about author formatting i.e. it must be Name <email@domain> 347 # git is fussy about author formatting i.e. it must be Name <email@domain>
347 if author_re.match(authorval): 348 if author_re.match(authorval):
348 author = authorval 349 author = authorval
350 elif from_commit_re.match(line):
351 # We don't want the From <commit> line - if it's present it will break rebasing
352 continue
349 outlines.append(line) 353 outlines.append(line)
350 return outlines, author, date, subject 354 return outlines, author, date, subject
351 355