diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-11-11 17:38:16 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-11-22 13:49:25 +0000 |
| commit | 0b4e147009bffa7b720ee767633e3acf3bb68c3a (patch) | |
| tree | 12448f87519c8738444618f53eb6ed49f632de92 /morphlib/plugins | |
| parent | d83d6ad7230eb27afae4169330681967bb20dcfa (diff) | |
| download | morph-0b4e147009bffa7b720ee767633e3acf3bb68c3a.tar.gz | |
GitDir: Add GitIndex class
This represents the state of the index of a GitDirectory.
Methods that use the index are now used via the GitIndex class, rather
than using the default index, as previously used when the methods were
in GitDirectory.
GitIndex may be constructed with an alternative path, which can be used
to manipulate a git checkout without altering a developer's view of the
repository i.e. The working tree and default index.
This is needed for `morph build` and `morph deploy` to handle the build
without commit logic.
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index e7b5abc1..8ad9effd 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -781,7 +781,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): if head != branch: self.app.output.write( ' %s: unexpected ref checked out %r\n' % (repo, head)) - if any(gd.get_uncommitted_changes()): + if any(gd.get_index().get_uncommitted_changes()): has_uncommitted_changes = True self.app.output.write(' %s: uncommitted changes\n' % repo) |