Test suite: Fix drs-push-masterupdate to refer to correct branch (brokenness detected...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 73184fbd7ff75ea30cebe73ec512fef24e6dfa6a..49c4f3644f3fa271612d5bf25ab2ea750f4a99b8 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1020,7 +1020,7 @@ sub check_for_git () {
            my ($usedistro,) = access_distros();
            $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
            $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
-           printdebug "diverting $divert so using distro $instead_distro\n";
+           progress "diverting to $divert (using config for $instead_distro)";
            return check_for_git();
        }
        failedcmd @cmd unless $r =~ m/^[01]$/;
@@ -1347,7 +1347,7 @@ sub git_fetch_us () {
     push @specs,
         map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
         qw(tags heads);
-    runcmd_ordryrun_local @git, qw(fetch -p -n), access_giturl(), @specs;
+    runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
 
     my %here;
     my $tagpat = debiantag('*',access_basedistro);
@@ -2802,6 +2802,11 @@ sub cmd_clone_dgit_repos_server {
     exec @cmd or fail "exec git clone: $!\n";
 }
 
+sub cmd_setup_mergechangelogs {
+    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    setup_mergechangelogs();
+}
+
 #---------- argument parsing and main program ----------
 
 sub cmd_version {