chiark / gitweb /
Strip `-b <branch>' from contents of Vcs-Git header, when setting up the vcs-git...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Nov 2014 15:03:11 +0000 (15:03 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Nov 2014 15:04:33 +0000 (15:04 +0000)
debian/changelog
dgit

index e0764f5..42b2fd6 100644 (file)
@@ -40,6 +40,9 @@ dgit (0.23~) unstable; urgency=low
 
   * Better documentation for quilt series handling.
 
 
   * 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
  --
 
 dgit (0.22.1) unstable; urgency=high
diff --git a/dgit b/dgit
index f6324e0..d936acd 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1413,6 +1413,7 @@ sub clone ($) {
     }
     fetch_from_archive() or no_such_package;
     my $vcsgiturl = $dsc->{'Vcs-Git'};
     }
     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;
     }
     if (length $vcsgiturl) {
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }