diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-11-02 13:50:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-07 13:58:38 +0000 |
| commit | b6b6b215675631d0e505ffc8b4890f85fb3169f9 (patch) | |
| tree | c36be5550e914b88455f15c86fde5f6a7e25d204 /scripts/combo-layer | |
| parent | ddb825c87dd3e59d50841a993080a00d1459b1e7 (diff) | |
| download | openembedded-core-b6b6b215675631d0e505ffc8b4890f85fb3169f9.tar.gz openembedded-core-b6b6b215675631d0e505ffc8b4890f85fb3169f9.tar.bz2 openembedded-core-b6b6b215675631d0e505ffc8b4890f85fb3169f9.tar.xz openembedded-core-b6b6b215675631d0e505ffc8b4890f85fb3169f9.zip | |
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>
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index f8763ee26..d6d238d83 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 |