Merge pull request #638 from sfromm/issue604

Fix for issue 604
2012-07-20 10:49:15 -07:00 · 2012-07-20 10:49:15 -07:00 · baf07659f7
commit baf07659f7
parent 70ef8e9ebb fd059a3df2
1 changed files with 1 additions and 2 deletions
--- a/library/git
+++ b/library/git
@ -148,10 +148,9 @@ def pull(repo, dest, branch):
   else:
      m = re.search( '^\s+%s$' % branch, gbranch_out, flags=re.M ) #see if we've already checked it out
      if m is None:
-         cmd = "git checkout -b %s origin/%s" % (branch, branch)
+         cmd = "git checkout --track -b %s origin/%s" % (branch, branch)

      else:
-         (out, err) = switchLocalBranch( branch )
         cmd = "git pull -u origin"

   cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)