Don't break if user has push.followTags=true. Closes:#827878.

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

diff --git a/debian/changelog b/debian/changelog
index 3d210d030a1ca91e8aa1a0e136f7e1b770983bf1..54583cff95297453ba070a7b3edff8ab540e5c13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,7 @@ dgit (1.5~~) unstable; urgency=medium
     of .orig components the same way as their tarballs.
   * Tidy up refs/dgit-fetch/ after dgit fetch (if successful).
   * Fix handling of in-archive copies.
+  * Don't break if user has push.followTags=true.  Closes:#827878.
 
   Test suite:
   * When sbuild fails, do not crash due to sed not finding the log

diff --git a/dgit b/dgit
index 150c11539a46bee1a46c32d256a33a99061bdcf4..a96f4711bb0d8c5fd7f3072bd3138b8b5733b489 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3221,7 +3221,8 @@ END
        push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
     }
 
-    runcmd_ordryrun @git, qw(push),access_giturl(), @pushrefs;
+    runcmd_ordryrun @git,
+       qw(-c push.followTags=false push), access_giturl(), @pushrefs;
     runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
 
     supplementary_message(<<'END');