When synthesing a commit from a .dsc from the archive, stop internal git reset from...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index ed3f52622288e921b0c44d1ee31c9f34becbc221..8404a19c2509021f1b8242bac094dc86d0d6e523 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1448,7 +1448,7 @@ END
     my $cversion = getfield $clogp, 'Version';
     progress "synthesised git commit from .dsc $cversion";
     if ($lastpush_hash) {
-       runcmd @git, qw(reset --hard), $lastpush_hash;
+       runcmd @git, qw(reset -q --hard), $lastpush_hash;
        runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
        my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
        my $oversion = getfield $oldclogp, 'Version';
@@ -3055,7 +3055,7 @@ END
     }
 
     my $debtar= srcfn $fakeversion,'.debian.tar.gz';
-    runcmd qw(env GZIP=-1 tar -zcf), "./$debtar", qw(-C ../../..), @files;
+    runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
 
     $dscaddfile->($debtar);
     close $fakedsc or die $!;