From 0d948b7ca6205272838569aeeb3b5bb83f1b8f09 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 10 Oct 2018 12:58:50 +0100
Subject: [PATCH] dgit: quilt linearisation: Stop at debian/source/format
 changes

Traversing a change of source format will not end well.
Discovered this possibility while investigating #910687.

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

diff --git a/dgit b/dgit
index 2f2b5091..8cea07b7 100755
--- a/dgit
+++ b/dgit
@@ -5503,7 +5503,8 @@ sub quiltify ($$$$) {
 	    printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
 
 	    my @cmd= (@git, qw(diff-tree -r --name-only),
-		      $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
+		      $p->{Commit},$c->{Commit},
+		      qw(-- debian/patches .pc debian/source/format));
 	    my $patchstackchange = cmdoutput @cmd;
 	    if (length $patchstackchange) {
 		$patchstackchange =~ s/\n/,/g;
-- 
2.30.2