Merge pull request #638 from sfromm/issue604

Fix for issue 604

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)