From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Oct 2017 19:29:32 +0000 (+0100)
Subject: git-debrebase: fix final diff check
X-Git-Tag: archive/debian/5.0~312
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3edf6f20e21644cf727fe79d4da47a8492653775;hp=642fd0e5e6795b9b1cd3d7decfb9d2d98760f06f;p=dgit.git

git-debrebase: fix final diff check
---

diff --git a/git-debrebase b/git-debrebase
index b4eb684d..f55ef4eb 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -684,7 +684,9 @@ sub walk ($;$$) {
 	}
     };
 
-    runcmd @git, qw(diff-tree --quiet), $input, $build;
+    my $final_check = get_differs $build, $input;
+    die sprintf "internal error %#x", $final_check
+	if $final_check & ~D_PAT_ADD;
 
     return ($build, $breakwater);
 }