From b7120584994325d4f6d2963ed336110355349fc6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 16 Jul 2016 12:52:05 +0100 Subject: [PATCH] When synthesing a commit from a .dsc from the archive, stop internal git reset from printing a confusing message about HEAD. --- debian/changelog | 2 ++ dgit | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 30db5c98..46e23dcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ dgit (1.5~~) unstable; urgency=medium messages. Closes:#800078. * Pass --ch:* and -v options to dpkg-buildpackage when building source. Fixes bad Perl poetry syntax. Closes:#829121. + * When synthesing a commit from a .dsc from the archive, stop + internal git reset from printing a confusing message about HEAD. Test suite: * When sbuild fails, do not crash due to sed not finding the log diff --git a/dgit b/dgit index 81c5ff91..8404a19c 100755 --- 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'; -- 2.30.2