From 542f874e8973e59e1dc3c2aa87584e05b8d1bbad Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 24 Aug 2018 21:11:40 +0100 Subject: 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 --- git-debrebase | 7 +++++++ 1 file changed, 7 insertions(+) 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) { -- cgit v1.2.3