diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-10-22 20:28:01 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 6e88f791b68d7ee8ddb97433aae6649d7b61d14d (patch) | |
| tree | 876b93e50560c247d45504a7df33e9d292cbc58e /git-debrebase | |
| parent | 0e8a298a68f8b71c57551659ee1b8c4bbe263374 (diff) | |
git-debrebase: get_differs tolerates addition of debian/series as well as appending to it
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 5d1e9c3..ee98f09 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'; |