From d3d05c8494cdae406e9952e4b80c6ae3a8a83669 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 31 Jul 2024 23:30:14 +0200
Subject: [PATCH] Do not merge -none columns, only clear name in netlink html.

---
 netlink-html.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/netlink-html.pl b/netlink-html.pl
index 6d5a834..751cef9 100755
--- a/netlink-html.pl
+++ b/netlink-html.pl
@@ -167,6 +167,8 @@ sub html_hier_test_head {
 	    } elsif ($hier eq "patch" && $hv->{diff}) {
 		my $link = uri_escape($hv->{diff}, "^A-Za-z0-9\-\._~/");
 		$name = "<a href=\"../$link\">$name</a>";
+	    } else {
+		$name =~ s/.*-none$//;
 	    }
 	    print $html "    <th class=\"hier\"$title>$name</th>\n";
 	}
@@ -194,6 +196,8 @@ sub html_hier_test_head_utilization {
 	    } elsif ($hier eq "patch" && $hv->{diff}) {
 		my $link = uri_escape($hv->{diff}, "^A-Za-z0-9\-\._~/");
 		$name = "<a href=\"../$link\">$name</a>";
+	    } else {
+		$name =~ s/.*-none$//;
 	    }
 	    print $html "    <$te class=\"hier $hier\"$title>$name</$te>\n";
 	}
@@ -554,9 +558,6 @@ sub glob_result_files {
 	    warn "Invalid subdir '$_' in result '$File::Find::name'";
 	    return;
 	}
-	foreach (values %f) {
-	    delete $f{$1} if /(.*)-none$/;
-	}
 	$f{dir} = $File::Find::dir;
 	$f{name} = $File::Find::name;
 	push @files, \%f;