diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-17 11:44:40 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-17 11:55:06 +0000 |
| commit | ac1cd545050a4aaa61e5b3f1dda5e278ba5e40b1 (patch) | |
| tree | aa5eae1563341548c99890b38fb3e40119527e9a /morphlib/plugins | |
| parent | 07f241a0aa4d485a8fe16c3d6a1d2ccf632c785b (diff) | |
| download | morph-ac1cd545050a4aaa61e5b3f1dda5e278ba5e40b1.tar.gz | |
Drop committer info from git tag environment; update tag test outputs
The committer information in the environment used to run git in morph
tag is not needed. In morph build it makes sense as morph commits without
the user knowing. With morph tag, it's the user that decides to create
the commit and tag.
There is something weird going on, where morph tag may end up generating
commits with different SHA1s on different machines. The full log output
in the morph tag tests might help investigate what happens.
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 0c6209da..24c76ace 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -837,18 +837,12 @@ class BranchAndMergePlugin(cliapp.Plugin): branch_root = self.get_branch_config(branch_dir, 'branch.root') branch_root_dir = self.find_repository(branch_dir, branch_root) - # Define the committer. - committer_name = morphlib.git.get_user_name(self.app.runcmd) - committer_email = morphlib.git.get_user_email(self.app.runcmd) - # Prepare an environment for our internal index file. # This index file allows us to commit changes to a tree without # git noticing any change in the working tree or its own index. env = dict(os.environ) env['GIT_INDEX_FILE'] = os.path.join( branch_root_dir, '.git', 'morph-tag-index') - env['GIT_COMMITTER_NAME'] = committer_name - env['GIT_COMMITTER_EMAIL'] = committer_email # Extract git arguments that deal with the commit message. # This is so that we can use them for creating the tag commit. |