aboutsummaryrefslogtreecommitdiffstats
path: root/ui-tree.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-09-04 06:00:06 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-09-04 06:00:06 (JST)
commitff13396926f3352d9e29c0663154918297dc5af7 (patch)
tree71979efc1ad17ab15a365f86ecb49dd128c65772 /ui-tree.c
parent4e7e8bf9616661bec0c9b9d9c50aca03e600f32b (diff)
parente651cb0d2dc2dbd458c51cdba8ae56e8629348cc (diff)
downloadcgit-ff13396926f3352d9e29c0663154918297dc5af7.zip
cgit-ff13396926f3352d9e29c0663154918297dc5af7.tar.gz
Merge branch 'jo/dirlink'
* jo/dirlink: Rename dirlink to gitlink. Conflicts: ui-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 634132f..1cb09f7 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -68,7 +68,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
68 cgit_query_path ? "/" : "", name); 68 cgit_query_path ? "/" : "", name);
69 69
70 type = sha1_object_info(sha1, &size); 70 type = sha1_object_info(sha1, &size);
71 if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { 71 if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
72 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 72 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
73 name, 73 name,
74 sha1_to_hex(sha1)); 74 sha1_to_hex(sha1));
@@ -78,7 +78,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
78 html("<tr><td class='ls-mode'>"); 78 html("<tr><td class='ls-mode'>");
79 html_filemode(mode); 79 html_filemode(mode);
80 html("</td><td>"); 80 html("</td><td>");
81 if (S_ISDIRLNK(mode)) { 81 if (S_ISGITLINK(mode)) {
82 htmlf("<a class='ls-mod' href='"); 82 htmlf("<a class='ls-mod' href='");
83 html_attr(fmt(cgit_repo->module_link, 83 html_attr(fmt(cgit_repo->module_link,
84 name, 84 name,