chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0542488
)
dgit: Rationalise some messages
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2015 22:10:09 +0000
(23:10 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2015 22:10:09 +0000
(23:10 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 3ef43485ffe088b1ef5cc7bf87e990de143d8a24..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;
my ($usedistro,) = access_distros();
$instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
$instead_distro =~ s{^/}{ access_basedistro()."/" }e;
- pr
intdebug "diverting $divert so using distro $instead_distro\n
";
+ pr
ogress "diverting to $divert (using config for $instead_distro)
";
return check_for_git();
}
failedcmd @cmd unless $r =~ m/^[01]$/;
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);
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);
my %here;
my $tagpat = debiantag('*',access_basedistro);