git-debrebase: convert-from-*: snag on discarding comments in series

series files can contain #-comments.  The conversion process will
throw them away, so complain about that.

Closes: #907198.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index ddb47bf6f29645665240cb459891239dcc7b5340..5fabfd6762e7a3d407521cafe17047ad5bb242e0 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -2449,7 +2449,14 @@ sub check_series_has_all_patches ($) {
        [qw(blob missing)];
     $series //= '';
     my %series;
        [qw(blob missing)];
     $series //= '';
     my %series;

+    our $comments_snagged;

     foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
     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) {
        fail "patch $f repeated in $seriesfn !" if $series{$f}++;
     }
     foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {