summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2016-06-29 01:43:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-29 01:43:41 +0000
commita36af0767bd180ac82c9ae4a1ae8418aa2dbec3f (patch)
tree21d9120cc3d666ec57db45d27e35b722b54d2e72
parent9d2b14d2ec39245103e9ceb664afb5f0227d9056 (diff)
parent037040f73e0940957dff77e74b40d5c85734e712 (diff)
downloadgit-repo-a36af0767bd180ac82c9ae4a1ae8418aa2dbec3f.tar.gz
Merge "Fix variable assignment"
-rw-r--r--project.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/project.py b/project.py
index 3b8604e3..c91085c3 100644
--- a/project.py
+++ b/project.py
@@ -1860,7 +1860,10 @@ class Project(object):
1860 # will fail. 1860 # will fail.
1861 # * otherwise, fetch all branches to make sure we end up with the 1861 # * otherwise, fetch all branches to make sure we end up with the
1862 # specific commit. 1862 # specific commit.
1863 current_branch_only = self.upstream and not ID_RE.match(self.upstream) 1863 if self.upstream:
1864 current_branch_only = not ID_RE.match(self.upstream)
1865 else:
1866 current_branch_only = False
1864 1867
1865 if not name: 1868 if not name:
1866 name = self.remote.name 1869 name = self.remote.name