summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-12-18 21:32:58 +0000
committerJune McEnroe <june@causal.agency>2020-12-27 19:51:10 -0500
commit5d4c6fbcbba90e81ecb723ccf2977b267f813527 (patch)
tree9aa1ac093c5ee67423fa206ca48c55b16ec6f3d6
parentBail from blame if blob is binary (diff)
downloadsrc-5d4c6fbcbba90e81ecb723ccf2977b267f813527.tar.gz
src-5d4c6fbcbba90e81ecb723ccf2977b267f813527.zip
Don't link to blame for binary blobs
Diffstat (limited to '')
-rw-r--r--www/git.causal.agency/cgit/ui-tree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/www/git.causal.agency/cgit/ui-tree.c b/www/git.causal.agency/cgit/ui-tree.c
index 1e4efb25..45e930e7 100644
--- a/www/git.causal.agency/cgit/ui-tree.c
+++ b/www/git.causal.agency/cgit/ui-tree.c
@@ -89,6 +89,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
 	enum object_type type;
 	char *buf;
 	unsigned long size;
+	int is_binary;
 
 	type = oid_object_info(the_repository, oid, &size);
 	if (type == OBJ_BAD) {
@@ -103,6 +104,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
 			"Error reading object %s", oid_to_hex(oid));
 		return;
 	}
+	is_binary = buffer_is_binary(buf, size);
 
 	cgit_set_title_from_path(path);
 
@@ -110,7 +112,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
 	htmlf("blob: %s (", oid_to_hex(oid));
 	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
 		        rev, path);
-	if (ctx.repo->enable_blame) {
+	if (ctx.repo->enable_blame && !is_binary) {
 		html(") (");
 		cgit_blame_link("blame", NULL, NULL, ctx.qry.head,
 			        rev, path);
@@ -123,7 +125,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
 		return;
 	}
 
-	if (buffer_is_binary(buf, size))
+	if (is_binary)
 		print_binary_buffer(buf, size);
 	else
 		print_text_buffer(basename, buf, size);