chiark / gitweb /
dgit(1): Tidying up after tag format: Drop splitbrain conditional
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 13:42:19 +0000 (14:42 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 15:01:33 +0000 (16:01 +0100)
Now, debiantags is always just debiantag_new plus
debiantag_maintview.  So we can drop this complexity.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index a6855b3a4b58883da47d7d141876cb631cf8473e..b104b7cedb75a0b221f9f3d748da27d394c29dd2 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2922,11 +2922,7 @@ sub git_fetch_us () {
     # deliberately-not-ff, in which case we must fetch everything.
 
     my @specs = deliberately_not_fast_forward ? qw(tags/*) :
-       map { "tags/$_" }
-       (quiltmode_splitbrain
-        ? (map { $_->('*',access_nomdistro) }
-           \&debiantag_new, \&debiantag_maintview)
-        : debiantags('*',access_nomdistro));
+       map { "tags/$_" } debiantags('*',access_nomdistro);
     push @specs, server_branch($csuite);
     push @specs, $rewritemap;
     push @specs, qw(heads/*) if deliberately_not_fast_forward;