Bug 2456

Summary: combo-layer: fail to handle empty merge commits
Product: [Build System, Metadata & Runtime] Meta-yocto Reporter: Otavio Salvador <otavio>
Component: meta-yoctoAssignee: Paul Eggleton <bluelightning>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: Low CC: poky.bs.watcher, poky.watcher, richard.purdie, sgw
Version: unspecified   
Target Milestone: 1.9   
Hardware: x86   
OS: Multiple   
Whiteboard:
OS type for building Yocto: --- Type of Regression: ---
Verified: Documentation change: No (bug/feature does not impact docs)

Description Otavio Salvador 2012-05-14 13:51:04 UTC
The combo-layer utility ought to update the commit hash to the merge commit otherwise in next call it will end doing a format-patch from the commit just before the merge and trying to reapply already commited ones.
Comment 1 Paul Eggleton 2015-05-12 08:32:07 UTC
This should finally be resolved by the following fix:

http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=dcb8f89723f809ceee9dbb0941a2cc5a43400e99