Actually understand foo,-security (!)

There does not in fact seem to have been any code which implements
this line from dgit(7):
    If a specified subsuite starts with - then mainsuite is prepended.
The code which canonicalises it back to the version with ",-" does
work, though.

Closes:#867189.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 3aa6a14d9a09a61afe5e9a8cb091327b50fd03d0..7c8db9f577f5907ae5b32f23d57d9e90af6c4991 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ dgit (3.11~) unstable; urgency=high
     Prompted by #867603.
   * Clone multisuite works even without --no-rm-on-error.  Closes:#867434.
   * Work if "git init" does not create $GIT/info.  Closes:#858054.
+  * Actually understand foo,-security (!)  Closes:#867189.
 
   Important bugfixes to other components:
   * dgit-badcommit-fixup: Honour core.sharedRepository.   Closes:#867603.

diff --git a/dgit b/dgit
index 743e8694af12817854c2d4ed45503d6f4ce1c972..ccf50094397d22f6f7ddb227e5ec3eb4baf36a3b 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3499,6 +3499,7 @@ sub fork_for_multisuite ($) {
     $before_fetch_merge->();
 
     foreach my $tsuite (@suites[1..$#suites]) {
+       $tsuite =~ s/^-/$cbasesuite-/;
        my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
                                               sub {
             @end = ();