Bug 2456 - combo-layer: fail to handle empty merge commits
Summary: combo-layer: fail to handle empty merge commits
Status: RESOLVED FIXED
Alias: None
Product: Meta-yocto
Classification: Build System, Metadata & Runtime
Component: meta-yocto (show other bugs)
Version: unspecified
Hardware: x86 Multiple
: Low normal
Target Milestone: 1.9
Assignee: Paul Eggleton
QA Contact:
URL:
Whiteboard:
Depends on:
Blocks:
 
Reported: 2012-05-14 13:51 UTC by Otavio Salvador
Modified: 2015-05-12 08:32 UTC (History)
4 users (show)

See Also:
OS type for building Yocto: ---
Type of Regression: ---
Verified:
Documentation change: No (bug/feature does not impact docs)

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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