aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-05-20 22:32:22 +0200
committerLars Hjemli <hjemli@gmail.com>2008-05-20 22:32:22 +0200
commit08a8757fa54ee70d31882344ca7f19de5cbe4690 (patch)
tree93cddfcbb81bbaf0fe8b3206d5f2f9c11dc6df9a
parentdd7c172542440170b5b1aca8be43d2ad6dae7227 (diff)
downloadcgit-08a8757fa54ee70d31882344ca7f19de5cbe4690.tar.gz
cgit-08a8757fa54ee70d31882344ca7f19de5cbe4690.tar.bz2
ui-tree.c: avoid peeking at GITLINK objects
When an object in the tree has GITLINK mode-bits we don't need to get any more info about that particular object (and trying to get more info about it will usually generate an annoying warning on stderr since the object typically doesn't exist in the repo anyways). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-tree.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 2f052c7..5a2dd3f 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -73,12 +73,14 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
ctx.qry.path ? "/" : "", name);
- type = sha1_object_info(sha1, &size);
- if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
- htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
- name,
- sha1_to_hex(sha1));
- return 0;
+ if (!S_ISGITLINK(mode)) {
+ type = sha1_object_info(sha1, &size);
+ if (type == OBJ_BAD) {
+ htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+ name,
+ sha1_to_hex(sha1));
+ return 0;
+ }
}
html("<tr><td class='ls-mode'>");