From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Sep 2016 12:23:38 +0000 (+0100)
Subject: Changelog handling: No not check out last push any more during raw import
X-Git-Tag: archive/debian/2.0~159
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4ce800ddb6a9f36b35e2a468af7d20e9604d2601;hp=41acb4ec92f077c3126a51621937f50000485d92

Changelog handling: No not check out last push any more during raw import

We now get the changelog with mergeinfo_getclogp (which just fetches
the changelog blob).  This working tree is not used for anything else,
and is deleted at the end of the function.  So there is no need to
switch branches.

There should be no overall behavioural change.

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

diff --git a/dgit b/dgit
index 6fb0711b..e125922e 100755
--- a/dgit
+++ b/dgit
@@ -1563,8 +1563,6 @@ END
     my @output = ($rawimport_mergeinput);
     progress "synthesised git commit from .dsc $cversion";
     if ($lastpush_mergeinput) {
-	my $lastpush_hash = $lastpush_mergeinput->{Commit};
-	runcmd @git, qw(reset -q --hard), $lastpush_hash;
 	my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
 	my $oversion = getfield $oldclogp, 'Version';
 	my $vcmp =