From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Jul 2017 13:37:10 +0000 (+0100)
Subject: git-debrebase: wip
X-Git-Tag: archive/debian/5.0~335
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=16cef99e719ad15ae70839a3a45a4d5b1f04a1b3

git-debrebase: wip
---

diff --git a/git-debrebase b/git-debrebase
index 5fa62b55..e5e92038 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -176,8 +176,26 @@ sub get_differs ($$) {
     }
 
     if ($differs & D_PAT_OTH) {
+	my $mode;
+	$differs &= ~D_PAT_OTH;
+	my $pat_oth = sub {
+	    $differs |= D_PAT_OTH;
+	    no qw(exiting);  last;
+	};
 	$rundiff([qw(--name-status)], ':debian/patches', sub {
-            
+            no warnings qw(exiting);
+            if (!defined $mode) {
+		$mode = $f;  next;
+	    } elsif ($mode eq 'A' && $f !~ m/^\w+\.series$/) {
+	    } elsif ($mode eq 'M' && $f eq 'series') {
+		my $x_s = git_cat_file "$x:debian/patches/series", 'blob';
+		my $y_s = git_cat_file "$y:debian/patches/series", 'blob';
+		chomp $x_s;  $x_s .= "\n";
+		$pat_oth->() unless $x_s = substr($y_s, 0, length $x_s);
+	    } else {
+		$pat_oth->();
+	    }
+	    $mode = undef;
         });