summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-debrebase7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index ddb47bf..5fabfd6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2449,7 +2449,14 @@ sub check_series_has_all_patches ($) {
[qw(blob missing)];
$series //= '';
my %series;
+ our $comments_snagged;
foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
+ if ($f =~ m/^\s*\#/) {
+ snag 'series-comments',
+ "$seriesfn contains comments, which will be discarded"
+ unless $comments_snagged++;
+ next;
+ }
fail "patch $f repeated in $seriesfn !" if $series{$f}++;
}
foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {