mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-02-17 03:00:22 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3d2f2b76f | ||
|
|
cd7c5deca0 |
@@ -1102,7 +1102,9 @@ class Project(object):
|
||||
len(local_changes) - cnt_mine)
|
||||
|
||||
branch.remote = self.GetRemote(self.remote.name)
|
||||
branch.merge = self.revisionExpr
|
||||
if not ID_RE.match(self.revisionExpr):
|
||||
# in case of manifest sync the revisionExpr might be a SHA1
|
||||
branch.merge = self.revisionExpr
|
||||
branch.Save()
|
||||
|
||||
if cnt_mine > 0 and self.rebase:
|
||||
@@ -1514,7 +1516,7 @@ class Project(object):
|
||||
except:
|
||||
return None
|
||||
|
||||
if e.code == 404:
|
||||
if e.code in (401, 403, 404):
|
||||
keep = False
|
||||
return False
|
||||
elif _content_type() == 'text/plain':
|
||||
|
||||
Reference in New Issue
Block a user