diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-28 13:42:22 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-28 13:42:22 +0000 |
| commit | e48bbe396cccb4f4be2e7170547cab1de3d6c623 (patch) | |
| tree | 243164aa11827a734299bda201220f2266b1eea1 /morphlib | |
| parent | ae72508c67c283efbb258515036e2b8e5eaa14ed (diff) | |
| parent | 7751ea4a71523fed39cefa6c9300f91e2446243b (diff) | |
| download | morph-e48bbe396cccb4f4be2e7170547cab1de3d6c623.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/temp-build-ref-commit-fix'
Broke a long line to make test suite pass.
Diffstat (limited to 'morphlib')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 88c017c8..60e8d4ef 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1486,9 +1486,10 @@ class BranchAndMergePlugin(cliapp.Plugin): # Obtain parent SHA1 for the temporary ref tree to be committed. # This will either be the current commit of the temporary ref or # HEAD in case the temporary ref does not exist yet. + system_branch_sha1 = self.resolve_ref(repo_dir, system_branch) parent_sha1 = self.resolve_ref(repo_dir, build_ref) if not parent_sha1: - parent_sha1 = self.resolve_ref(repo_dir, system_branch) + parent_sha1 = system_branch_sha1 # Prepare an environment with our internal index file. # This index file allows us to commit changes to a tree without @@ -1499,8 +1500,8 @@ class BranchAndMergePlugin(cliapp.Plugin): env['GIT_COMMITTER_NAME'] = committer_name env['GIT_COMMITTER_EMAIL'] = committer_email - # Read tree from parent or current HEAD into the morph index. - self.app.runcmd(['git', 'read-tree', parent_sha1], + # Read tree from current HEAD into the morph index. + self.app.runcmd(['git', 'read-tree', system_branch_sha1], cwd=repo_dir, env=env) self.app.status(msg='%(repo)s: Adding uncommitted changes to ' |