about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2022-08-29 09:26:47 +0000
committerEric Wong <e@80x24.org>2022-08-29 19:06:35 +0000
commit35b7adee1f01a7cce720d944e1666aa44717d024 (patch)
treebfd2441f6bf8311308400ecad2baadde2035c736
parenta99bf0f90d6d59b8c81876651aaabcd2fd1c4094 (diff)
downloadpublic-inbox-35b7adee1f01a7cce720d944e1666aa44717d024.tar.gz
This is more consistent with the rest of the output where it's
"$TYPE $OID" rather than "$OID $TYPE".  The former also allows
easy copy+pasting into commands for both "git cat-file blob $OID"
and "lei blob $OID".
-rw-r--r--lib/PublicInbox/ViewVCS.pm6
-rw-r--r--t/solver_git.t3
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 6b6b94fb..3b4fa393 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -415,7 +415,7 @@ sub solve_result {
                 return stream_large_blob($ctx, $res) if defined $ctx->{fn};
                 return html_page($ctx, 200, <<EOM . dbg_log($ctx));
 <pre><b>Too big to show, download available</b>
-"$oid $type $size bytes $raw_link</pre>
+blob $oid $size bytes $raw_link</pre>
 EOM
         }
 
@@ -434,7 +434,7 @@ EOM
         }
 
         $bin and return html_page($ctx, 200,
-                                "<pre>$oid $type $size bytes (binary)" .
+                                "<pre>blob $oid $size bytes (binary)" .
                                 " $raw_link</pre>".dbg_log($ctx));
 
         # TODO: detect + convert to ensure validity
@@ -450,7 +450,7 @@ EOM
                 $$blob = ascii_html($$blob);
         }
 
-        my $x = "<pre>$oid $type $size bytes $raw_link</pre>" .
+        my $x = "<pre>blob $oid $size bytes $raw_link</pre>" .
                 "<hr /><table\nclass=blob>".
                 "<tr><td\nclass=linenumbers><pre>";
         $x .= sprintf("<a id=n$_ href=#n$_>% ${pad}u</a>\n", $_) for (1..$nl);
diff --git a/t/solver_git.t b/t/solver_git.t
index 5c7bfa28..958af065 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -287,7 +287,8 @@ EOF
                 while (my ($label, $size) = each %bin) {
                         $res = $cb->(GET("/$name/$oid{$label}/s/"));
                         is($res->code, 200, "$label binary file");
-                        ok(index($res->content, "blob $size bytes") >= 0,
+                        ok(index($res->content,
+                                "blob $oid{$label} $size bytes") >= 0,
                                 "showed $label binary blob size");
                         $res = $cb->(GET("/$name/$oid{$label}/s/raw"));
                         is($res->code, 200, "$label raw binary download");