]> code.ossystems Code Review - openembedded-core.git/commit
scripts/combo-layer: ignore merge commits
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Wed, 2 Nov 2011 13:50:48 +0000 (13:50 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 7 Nov 2011 13:58:38 +0000 (13:58 +0000)
commitb6b6b215675631d0e505ffc8b4890f85fb3169f9
treec36be5550e914b88455f15c86fde5f6a7e25d204
parentddb825c87dd3e59d50841a993080a00d1459b1e7
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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
scripts/combo-layer