From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Nov 2014 15:03:11 +0000 (+0000)
Subject: Strip `-b <branch>' from contents of Vcs-Git header, when setting up the vcs-git... 
X-Git-Tag: debian/0.30~279
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e0673a9afdec58cc24eef17bc8c017aa6b30f11b;ds=sidebyside

Strip `-b <branch>' from contents of Vcs-Git header, when setting up the vcs-git remote.  Closes:#759374.
---

diff --git a/debian/changelog b/debian/changelog
index e0764f55..42b2fd61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ dgit (0.23~) unstable; urgency=low
 
   * Better documentation for quilt series handling.
 
+  * Strip `-b <branch>' from contents of Vcs-Git header, when setting up
+    the vcs-git remote.  Closes:#759374.
+
  --
 
 dgit (0.22.1) unstable; urgency=high
diff --git a/dgit b/dgit
index f6324e02..d936acdf 100755
--- a/dgit
+++ b/dgit
@@ -1413,6 +1413,7 @@ sub clone ($) {
     }
     fetch_from_archive() or no_such_package;
     my $vcsgiturl = $dsc->{'Vcs-Git'};
+    $vcsgiturl =~ s/\s+-b\s+\S+//g;
     if (length $vcsgiturl) {
 	runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }