use replace way to get target branch instead of split

Fixes: #1421
Change-Id: Icf9ccbf65ac7059488ea2f976a60d4a9eedbd75e

diff --git a/debian/changelog b/debian/changelog
index 1d9ce5c18dfe519c6379a0e312c4efb228d053c2..c1af3ab462c703b879b7f100fd09ee2b501277c0 100644 (file)
--- 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 809b3390bbf3132fe37bd8ee1ac7cae96c22c0c9..e3d264e2723d6492f38f2b3ba22bfb068e2868f2 100644 (file)
--- 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 5e466e4339fbb26f5000d9f3d080851325318df0..9308d68423e83c8447aa183d41198139ffe00ea7 100644 (file)
--- 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 870944818498c0ce970472773fa52ddc44cd93e3..5cc0af853f722aac3b56061ee0e7a830d531af13 100644 (file)
--- 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: