diff options
author | Shawn O. Pearce <sop@google.com> | 2008-11-12 18:37:18 -0800 |
---|---|---|
committer | Shawn O. Pearce <sop@google.com> | 2008-11-12 18:37:18 -0800 |
commit | 34d237fbfbd87e8bb81063c23737e9b1ee4d5679 (patch) | |
tree | 55266531e2a8a244b0330d71b0aac2690fbe92a7 | |
parent | c99883fee990a1baa7e0bf5f854c7485b7d0f0d9 (diff) | |
download | git-repo-34d237fbfbd87e8bb81063c23737e9b1ee4d5679.tar.gz |
Paper bag fix repo 1.3's "repo upload" without --replacev1.3.1
If we aren't doing a replacement we do not have any
replace rules, so we cannot iterate over them.
Signed-off-by: Shawn O. Pearce <sop@google.com>
-rwxr-xr-x | gerrit_upload.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gerrit_upload.py b/gerrit_upload.py index 32451408..d3d4ff3e 100755 --- a/gerrit_upload.py +++ b/gerrit_upload.py | |||
@@ -114,10 +114,11 @@ def UploadBundle(project, | |||
114 | req.dest_branch = str(dest_branch) | 114 | req.dest_branch = str(dest_branch) |
115 | for c in revlist: | 115 | for c in revlist: |
116 | req.contained_object.append(c) | 116 | req.contained_object.append(c) |
117 | for change_id,commit_id in replace_changes.iteritems(): | 117 | if replace_changes: |
118 | r = req.replace.add() | 118 | for change_id,commit_id in replace_changes.iteritems(): |
119 | r.change_id = change_id | 119 | r = req.replace.add() |
120 | r.object_id = commit_id | 120 | r.change_id = change_id |
121 | r.object_id = commit_id | ||
121 | else: | 122 | else: |
122 | req = UploadBundleContinue() | 123 | req = UploadBundleContinue() |
123 | req.bundle_id = bundle_id | 124 | req.bundle_id = bundle_id |