chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d816dc3
)
git-debrebase: get_differs tolerates addition of debian/series as well as appending...
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 22 Oct 2017 19:28:01 +0000
(20:28 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 19:19:06 +0000
(19:19 +0000)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 5d1e9c3dc99bf16ffa3605c1e999303a15e28770..ee98f09f9b121a5affb978c83314c4255a8859c0 100755
(executable)
--- 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';