diff options
| author | June McEnroe <june@causal.agency> | 2019-12-18 21:32:58 +0000 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-12-27 19:51:10 -0500 |
| commit | 6501966762dd4feee727d9598a4fe02d67ccf85d (patch) | |
| tree | f65d7edb8f93c4ea7e9fe699ff5b98178fd2e0dc | |
| parent | Bail from blame if blob is binary (diff) | |
| download | src-6501966762dd4feee727d9598a4fe02d67ccf85d.tar.gz src-6501966762dd4feee727d9598a4fe02d67ccf85d.zip | |
Don't link to blame for binary blobs
| -rw-r--r-- | www/git.causal.agency/cgit/ui-tree.c | 6 |
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); |