commit 2ec36918051e2b6eb7a29daba6be2b4e156b05b6
author Jenkins <jenkins@review.openstack.org> Fri Dec 12 12:10:13 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 12 12:10:13 2014 +0000
tree d971a39ad93eac24bc57f32b67f3adcfc1dfe0a9
parent 59c6b84c02665547c5f8ae68eeacc293c31a22c4
parent d761db00292abdacc34e7038e2b7a03051f6828b

Merge "Add a git clean command before updating local copy"

jeepyb/cmd/manage_projects.py

diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index ff5b4c7..6ad970e 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -395,6 +395,10 @@
 
 
 def update_local_copy(repo_path, track_upstream, git_opts, ssh_env):
+    # first do a clean of the branch to prevent possible
+    # problems due to previous runs
+    git_command(repo_path, "clean -fdx")
+
     has_upstream_remote = (
         'upstream' in git_command_output(repo_path, 'remote')[1])
     if track_upstream: