x/anvil
Code Issues Proposed changes

Always delete current branch before branch creation in git

Browse Source 
If repository must be checked out to current branch, it should
be removed before recreating.

Change-Id: I69a8c51ff7fca79a79a17c6c9420a4cb417061b7
This commit is contained in:
Anastasia Karpinska 2013-05-31 14:43:06 +04:00 committed by Joshua Harlow
parent 1ed84bb3d3
commit b685456913
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
anvil/downloader.py
View File

@ -79,15 +79,6 @@ class GitDownloader(Downloader):
sh.execute(*cmd, cwd=self.store_where) sh.execute(*cmd, cwd=self.store_where)
cmd = ["git", "reset", "--hard"] cmd = ["git", "reset", "--hard"]
sh.execute(*cmd, cwd=self.store_where) sh.execute(*cmd, cwd=self.store_where)
# detach, drop new_branch if it exists, and checkout to new_branch
# newer git allows branch resetting: git checkout -B $new_branch
# so, all these are for compatibility with older RHEL git
cmd = ["git", "rev-parse", "HEAD"]
git_head = sh.execute(*cmd, cwd=self.store_where)[0].strip()
cmd = ["git", "checkout", git_head]
sh.execute(*cmd, cwd=self.store_where)
cmd = ["git", "branch", "-D", new_branch]
sh.execute(*cmd, cwd=self.store_where, ignore_exit_code=True)
else: else:
LOG.info("Downloading %s (%s) to %s.", colorizer.quote(uri), branch, colorizer.quote(self.store_where)) LOG.info("Downloading %s (%s) to %s.", colorizer.quote(uri), branch, colorizer.quote(self.store_where))
cmd = ["git", "clone", uri, self.store_where] cmd = ["git", "clone", uri, self.store_where]
@ -96,6 +87,15 @@ class GitDownloader(Downloader):
LOG.info("Adjusting to tag %s.", colorizer.quote(tag)) LOG.info("Adjusting to tag %s.", colorizer.quote(tag))
else: else:
LOG.info("Adjusting branch to %s.", colorizer.quote(branch)) LOG.info("Adjusting branch to %s.", colorizer.quote(branch))
# detach, drop new_branch if it exists, and checkout to new_branch
# newer git allows branch resetting: git checkout -B $new_branch
# so, all these are for compatibility with older RHEL git
cmd = ["git", "rev-parse", "HEAD"]
git_head = sh.execute(*cmd, cwd=self.store_where)[0].strip()
cmd = ["git", "checkout", git_head]
sh.execute(*cmd, cwd=self.store_where)
cmd = ["git", "branch", "-D", new_branch]
sh.execute(*cmd, cwd=self.store_where, ignore_exit_code=True)
cmd = ["git", "checkout"] + checkout_what cmd = ["git", "checkout"] + checkout_what
sh.execute(*cmd, cwd=self.store_where) sh.execute(*cmd, cwd=self.store_where)