Changelog handling: Use mergeinfo_getclogp during raw import

No overall functional change.

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

diff --git a/dgit b/dgit
index 8bf4794ffa4148a3a7ca4fbde1a4287873b19efa..6fb0711b58734c969b2cfddc61f72ab0d8fd1d7f 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;
     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);
        my $oversion = getfield $oldclogp, 'Version';
        my $vcmp =
            version_compare($oversion, $cversion);