From 41acb4ec92f077c3126a51621937f50000485d92 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Sep 2016 13:23:07 +0100
Subject: [PATCH] Changelog handling: Use mergeinfo_getclogp during raw import

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dgit b/dgit
index 8bf4794f..6fb0711b 100755
--- 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);
-- 
2.30.2