commit 12fd10c20115046dcd2fbe468a45e566f38ffbc9
author Conley Owens <cco3@android.com> Wed Oct 16 21:41:33 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 21:41:33 2013 +0000
tree 071b7878cdcf5ff17b094c8158cf0654efbba1fd
parent fbd3f2a10bf4ddd1f001543c6262c6866a84f0a1
parent a17d7af4d9dd9165935a26a9971faed2c05bc278

Merge "Dan't accessing attr of None (`manifest` subcmd)"

subcmds/upload.py

diff --git a/subcmds/upload.py b/subcmds/upload.py
index 7d460dd..7f7585a 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -349,15 +349,16 @@
 
         # Make sure our local branch is not setup to track a different remote branch
         merge_branch = self._GetMergeBranch(branch.project)
-        full_dest = 'refs/heads/%s' % destination
-        if not opt.dest_branch and merge_branch and merge_branch != full_dest:
-          print('merge branch %s does not match destination branch %s'
-                % (merge_branch, full_dest))
-          print('skipping upload.')
-          print('Please use `--destination %s` if this is intentional'
-                % destination)
-          branch.uploaded = False
-          continue
+        if destination:
+          full_dest = 'refs/heads/%s' % destination
+          if not opt.dest_branch and merge_branch and merge_branch != full_dest:
+            print('merge branch %s does not match destination branch %s'
+                  % (merge_branch, full_dest))
+            print('skipping upload.')
+            print('Please use `--destination %s` if this is intentional'
+                  % destination)
+            branch.uploaded = False
+            continue
 
         branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
         branch.uploaded = True