Dgit.pm: Move $suite_re from dgit

[dgit.git] / dgit

diff --git a/dgit b/dgit
index e9b2cd54e90a6d29d4d91552dba88516b6d6b713..6febb07aa45ef0e69b0a8283a9b5f0afcbe29565 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -104,7 +104,6 @@ our %forceopts = map { $_=>0 }
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
-our $suite_re = '[-+.0-9a-z]+';
 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
                      | (?: git | git-ff ) (?: ,always )?
                          | check (?: ,ignores )?
@@ -4385,6 +4384,10 @@ END
 %s release %s for %s (%s) [dgit]
 ENDT
                or confess "$!";
+           unshift @dtxinfo, "--quilt=$quilt_mode" if madformat($format);
+           unshift @dtxinfo, do_split_brain() ? "split" : "no-split"
+               # rpush protocol 5 and earlier don't tell us
+               unless $we_are_initiator && $protovsn < 6;
            my $dtxinfo = join(" ", "",@dtxinfo);
            print TO <<END or confess "$!";
 [dgit distro=$declaredistro$dtxinfo]