summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-18 13:23:07 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-25 20:12:52 +0100
commit41acb4ec92f077c3126a51621937f50000485d92 (patch)
treec82a0156ea8ae83b4c9fcd465224d3467a4c89a5 /dgit
parent15e42009c4fb4694a4774ee5bc380ae66697cc79 (diff)
Changelog handling: Use mergeinfo_getclogp during raw import
No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit3
1 files changed, 1 insertions, 2 deletions
diff --git a/dgit b/dgit
index 8bf4794..6fb0711 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);