don't specify the default upstream-branch option

The builder (depanneur) and export module can take the correct
upstream-branch.

Change-Id: I78e2a5f323f350896f31e21efd6d9e053f88bacc

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index b0edc6d..878c58a 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -316,11 +316,7 @@ def main(args):
         cmd += ['--commit=%s' % args.commit]
 
     if args.upstream_branch:
-        upstream_branch = args.upstream_branch
-    else:
-        upstream_branch = configmgr.get('upstream_branch', 'general')
-    cmd += ['--upstream-branch=%s' % upstream_branch]
-
+        cmd += ['--upstream-branch=%s' % args.upstream_branch]
     if args.upstream_tag:
         cmd += ['--upstream-tag=%s' % args.upstream_tag]
     if args.squash_patches_until: