chiark / gitweb /
Changelog handling: Use mergeinfo_getclogp during raw import
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 18 Sep 2016 12:23:07 +0000 (13:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 25 Sep 2016 19:12:52 +0000 (20:12 +0100)
No overall functional change.

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

diff --git a/dgit b/dgit
index 8bf4794..6fb0711 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1565,8 +1565,7 @@ END
     if ($lastpush_mergeinput) {
        my $lastpush_hash = $lastpush_mergeinput->{Commit};
        runcmd @git, qw(reset -q --hard), $lastpush_hash;
-       runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
-       my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
+       my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
        my $oversion = getfield $oldclogp, 'Version';
        my $vcmp =
            version_compare($oversion, $cversion);