X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=d62694a90818c7d461324381f57a3eb4d6b3afc2;hp=f6c845d967da3d2083890f9ff832f999204ac00d;hb=3ebc4309c3155cdacdc00900c8f3554932e32d5b;hpb=a0fafdb431fa23f6de127a8d38a62ccfc12f3537

diff --git a/dgit b/dgit
index f6c845d9..d62694a9 100755
--- a/dgit
+++ b/dgit
@@ -4299,7 +4299,8 @@ sub fetchpullargs () {
 	$isuite = branchsuite();
 	if (!$isuite) {
 	    my $clogp = parsechangelog();
-	    $isuite = getfield $clogp, 'Distribution';
+	    my $clogsuite = getfield $clogp, 'Distribution';
+	    $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
 	}
     } elsif (@ARGV==1) {
 	($isuite) = @ARGV;
@@ -5415,6 +5416,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
+    runcmd @git, qw(checkout -f), $headref, qw(-- debian);
     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";