X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=366c4566fc52f295957919a1e1039e97650f8dab;hp=73184fbd7ff75ea30cebe73ec512fef24e6dfa6a;hb=395e3a0f5c1d2541a84ac6105f02c7eac34f434b;hpb=d2c91253e64e144d17d0f5a0ce9c72661c43a29c

diff --git a/dgit b/dgit
index 73184fbd..366c4566 100755
--- a/dgit
+++ b/dgit
@@ -448,6 +448,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.git-user-force' => 'dgit',
 	       'dgit-distro.debian.git-proto' => 'git+ssh://',
 	       'dgit-distro.debian.git-path' => '/dgit/debian/repos',
+	       'dgit-distro.debian.git-create' => 'true',
 	       'dgit-distro.debian.git-check' => 'ssh-cmd',
  'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
 # 'dgit-distro.debian.archive-query-tls-key',
@@ -1020,7 +1021,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 +1348,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);
@@ -2753,7 +2754,7 @@ sub cmd_sbuild {
     changedir "..";
     my $pat = "${package}_".(stripepoch $version)."_*.changes";
     if (act_local()) {
-	stat_exist $dscfn or fail "$dscfn (in parent directory): $!";
+	stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
 	stat_exists $sourcechanges
 	    or fail "$sourcechanges (in parent directory): $!";
 	foreach my $cf (glob $pat) {
@@ -2802,6 +2803,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 {