summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-02 13:50:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:35 +0000
commit2293acaa7fb40fd5aad8a0e5deda6bc1097067b9 (patch)
tree0685e0b5882ec3441bce3959a991d57aa928f67b
parent426ad821065c50fc008a140e5b2334d2c97511c3 (diff)
downloadpoky-2293acaa7fb40fd5aad8a0e5deda6bc1097067b9.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index f8763ee26a..d6d238d83c 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -218,7 +218,7 @@ def action_update(conf, args):
218 logger.debug("generated patch set:\n%s" % output) 218 logger.debug("generated patch set:\n%s" % output)
219 patchlist = output.splitlines() 219 patchlist = output.splitlines()
220 220
221 rev_cmd = 'git log --pretty=format:"%H" ' + rev_cmd_range 221 rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range
222 revlist = runcmd(rev_cmd, ldir).splitlines() 222 revlist = runcmd(rev_cmd, ldir).splitlines()
223 223
224 # Step 3: Call repo specific hook to adjust patch 224 # Step 3: Call repo specific hook to adjust patch