From 6e88f791b68d7ee8ddb97433aae6649d7b61d14d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Oct 2017 20:28:01 +0100 Subject: [PATCH] git-debrebase: get_differs tolerates addition of debian/series as well as appending to it --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'; -- 2.30.2