]> code.ossystems Code Review - openembedded-core.git/commit
lib/oe/patch: exclude "From <hash>" from commit message when PATCHTOOL is "git"
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Fri, 23 Sep 2016 09:22:10 +0000 (21:22 +1200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 23 Sep 2016 17:06:10 +0000 (18:06 +0100)
commit19a6b18ac23cb2d7bb89203f774b2bee7f0cb03c
tree5efaee7c05e8eb80c979d0f73843a973023a9cbf
parent49919585e5cec2999201fce8cb1b70f1cf7f591e
lib/oe/patch: exclude "From <hash>" from commit message when PATCHTOOL is "git"

If you leave "From <hash>" lines in the commit message it can actually
break git rebase because it tries to interpret the line in the context
of the current repository, and if the hash is invalid then a rebase
will blow up with:

  fatal: git cat-file: could not get object info

or in newer git versions:

  error: unable to find <hash>
  fatal: git cat-file <hash>: bad file

(I hit this when I tried to do a devtool upgrade on openssl to 1.0.2i
the first time I did "git rebase --skip")

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/patch.py