From da9855227636c46d09546eacedd95aa8ace7185a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 8 Jul 2017 22:31:09 +0100 Subject: [PATCH] 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 --- debian/changelog | 1 + dgit | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3aa6a14d..7c8db9f5 100644 --- 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 743e8694..ccf50094 100755 --- 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 = (); -- 2.30.2