summaryrefslogtreecommitdiff
path: root/firehose/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'firehose/plugin')
-rw-r--r--firehose/plugin/firehose_plugin.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/firehose/plugin/firehose_plugin.py b/firehose/plugin/firehose_plugin.py
index fdd5b20..7229830 100644
--- a/firehose/plugin/firehose_plugin.py
+++ b/firehose/plugin/firehose_plugin.py
@@ -177,8 +177,10 @@ class FirehosePlugin(cliapp.Plugin):
def reset_to_tracking(self, root):
logging.info('reset_to_tracking')
+ # Obtain the head of the repo
branch_head_sha = self.app.runcmd(['git', 'rev-parse', 'HEAD'],
cwd=self.gitpath).strip()
+ # Do a hard reset to the master branch
self.app.runcmd(['git', 'reset', '--hard', 'origin/%s' % root['baseref']],
cwd=self.gitpath)
self.app.runcmd(['git', 'reset', '--soft', branch_head_sha],
@@ -309,6 +311,7 @@ class FirehosePlugin(cliapp.Plugin):
self.loader.unset_defaults(morph)
self.loader.save_to_file(
self.sb.get_filename(morph.repo_url, morph.filename), morph)
+ logging.info('Changed definition: '+morph.repo_url+' '+morph.filename)
morph.dirty = False
return True