From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Oct 2017 19:28:01 +0000 (+0100)
Subject: git-debrebase: get_differs tolerates addition of debian/series as well as appending... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=36017fbe32beb628913308be0988e33cd29fe25a;p=dgit.git

git-debrebase: get_differs tolerates addition of debian/series as well as appending to it
---

diff --git a/git-debrebase b/git-debrebase
index 5d1e9c3d..ee98f09f 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -212,7 +212,7 @@ sub get_differs ($$) {
 	    }
 	    die unless s{^debian/patches/}{};
 	    my $ok;
-	    if ($mode eq 'A' && !m/(?:^|\.)series$/s) {
+	    if ($mode eq 'A' && !m/\.series$/s) {
 		$ok = 1;
 	    } elsif ($mode eq 'M' && $_ eq 'series') {
 		my $x_s = git_cat_file "$x:debian/patches/series", 'blob';