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 234d9e447b..7c41f92744 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -1186,7 +1186,7 @@ def update_with_history(conf, components, revisions, repos): | |||
1186 | msg = conf_commit_msg(conf, components) | 1186 | msg = conf_commit_msg(conf, components) |
1187 | new_tree = runcmd("git write-tree", **wargs).strip() | 1187 | new_tree = runcmd("git write-tree", **wargs).strip() |
1188 | new_rev = runcmd("git commit-tree".split() + | 1188 | new_rev = runcmd("git commit-tree".split() + |
1189 | add_p([head] + additional_heads.keys()) + | 1189 | add_p([head] + list(additional_heads.keys())) + |
1190 | ["-m", msg, new_tree], | 1190 | ["-m", msg, new_tree], |
1191 | **wargs).strip() | 1191 | **wargs).strip() |
1192 | # And done! This is the first time we change the HEAD in the actual work tree. | 1192 | # And done! This is the first time we change the HEAD in the actual work tree. |