From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Mon, 28 Oct 2013 03:19:06 +0000 (+0800)
Subject: use replace way to get target branch instead of split
X-Git-Tag: 0.20~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8660f34ed8050760f17055836c15ab8fb8d51955;p=tools%2Fgbs.git

use replace way to get target branch instead of split

Fixes: #1421

Change-Id: Icf9ccbf65ac7059488ea2f976a60d4a9eedbd75e
---

diff --git a/debian/changelog b/debian/changelog
index 1d9ce5c..c1af3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ gbs (0.19-1) unstable; urgency=high
     including insert patches and VCS tag
   * [export] use commit sha1 instead of tag name in spec file VCS tag
   * [clone] add directory argument to gbs clone
+  * [submit] support '/' in git branch
   * [conf] overwrite different level of gbs.conf instead of clean up them.
   * [conf] load project special gbs.conf if gitdir specified
   * update dependencies:
diff --git a/docs/RELEASE_NOTES b/docs/RELEASE_NOTES
index 809b339..e3d264e 100644
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
@@ -17,6 +17,8 @@ Release notes for gbs 0.19
     - update all spec file if multiple spec files exist, updates
       including insert patches and VCS tag
     - use commit sha1 instead of tag name in spec file VCS tag
+  * submit:
+    - support '/' in git branch
   * clone:
     - add directory argument to gbs clone
   * conf parser:
diff --git a/gitbuildsys/cmd_submit.py b/gitbuildsys/cmd_submit.py
index 5e466e4..9308d68 100644
--- a/gitbuildsys/cmd_submit.py
+++ b/gitbuildsys/cmd_submit.py
@@ -87,7 +87,7 @@ def main(args):
         target = args.target
         if not target:
             if upstream and upstream.startswith(args.remote):
-                target = os.path.basename(upstream)
+                target = re.sub('^%s/' % args.remote, '', upstream)
             else:
                 log.warning("Can't find upstream branch for current branch "
                             "%s. Gbs uses the local branch name as the target. "
diff --git a/packaging/gbs.changes b/packaging/gbs.changes
index 8709448..5cc0af8 100644
--- a/packaging/gbs.changes
+++ b/packaging/gbs.changes
@@ -10,6 +10,7 @@
     including insert patches and VCS tag
   * [export] use commit sha1 instead of tag name in spec file VCS tag
   * [clone] add directory argument to gbs clone
+  * [submit] support '/' in git branch
   * [conf] overwrite different level of gbs.conf instead of clean up them.
   * [conf] load project special gbs.conf if gitdir specified
   * update dependencies: