From: Paul Eggleton Date: Wed, 2 Nov 2011 13:50:48 +0000 (+0000) Subject: scripts/combo-layer: ignore merge commits X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2293acaa7fb40fd5aad8a0e5deda6bc1097067b9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git scripts/combo-layer: ignore merge commits The combo-layer tool had trouble handling merge commits as they were included in the revision list but not the patches; these are now excluded from the revision list. Note however that this will not handle merge commits that resolved a conflict; since "git format-patch" cannot construct a linear change history over such merges there is nothing we can currently do with these. (From OE-Core rev: b6b6b215675631d0e505ffc8b4890f85fb3169f9) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/scripts/combo-layer b/scripts/combo-layer index f8763ee26aa..d6d238d83c4 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -218,7 +218,7 @@ def action_update(conf, args): logger.debug("generated patch set:\n%s" % output) patchlist = output.splitlines() - rev_cmd = 'git log --pretty=format:"%H" ' + rev_cmd_range + rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range revlist = runcmd(rev_cmd, ldir).splitlines() # Step 3: Call repo specific hook to adjust patch