X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=5e852b60db8c808b2dc7a43b66cb96d9be59fe96;hp=c79deb48e4c5e686abaa87160db798081d3a7863;hb=7fd4808a58916386f5acab86877cb6c7f7d61c86;hpb=68db28cfe420b28f3259f1048fa05cbfb903baa7 diff --git a/dgit b/dgit index c79deb48..5e852b60 100755 --- a/dgit +++ b/dgit @@ -1579,12 +1579,14 @@ END close C or die $!; my $rawimport_hash = make_commit qw(../commit.tmp); my $cversion = getfield $clogp, 'Version'; + progress "synthesised git commit from .dsc $cversion"; + my $rawimport_mergeinput = { Commit => $rawimport_hash, Info => "Import of source package", }; my @output = ($rawimport_mergeinput); - progress "synthesised git commit from .dsc $cversion"; + if ($lastpush_mergeinput) { my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput); my $oversion = getfield $oldclogp, 'Version';