diff options
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 e47059290d..52367f091d 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
| @@ -1178,7 +1178,7 @@ def update_with_history(conf, components, revisions, repos): | |||
| 1178 | # components imported head revision. | 1178 | # components imported head revision. |
| 1179 | if additional_heads: | 1179 | if additional_heads: |
| 1180 | runcmd("git reset --hard", **wargs) | 1180 | runcmd("git reset --hard", **wargs) |
| 1181 | for rev, base in additional_heads.iteritems(): | 1181 | for rev, base in additional_heads.items(): |
| 1182 | apply_commit(base, rev, wargs, wargs, None) | 1182 | apply_commit(base, rev, wargs, wargs, None) |
| 1183 | 1183 | ||
| 1184 | # Commit with all component branches as parents as well as the previous head. | 1184 | # Commit with all component branches as parents as well as the previous head. |
