Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --cc ui-diff.c
Simple merge

diff --cc ui-tree.c
index 634132f8d4554647cc4a87e46ad6fcb3d899a2aa,21dd533cf8edfb9432cd8a88d9f5d762340e7462..1cb09f717a56826dfd2cb132cdd78f72c3aad341
--- 1/ui-tree.c
--- 2/ui-tree.c
+++ b/ui-tree.c
@@@ -64,22 -19,18 +64,22 @@@ static int ls_item(const unsigned char 
        unsigned long size = 0;
  
        name = xstrdup(pathname);
 +      fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
 +                     cgit_query_path ? "/" : "", name);
 +
        type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
+       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;
        }
 -      html("<tr><td class='filemode'>");
 +
 +      html("<tr><td class='ls-mode'>");
        html_filemode(mode);
 -      html("</td><td ");
 +      html("</td><td>");
-       if (S_ISDIRLNK(mode)) {
+       if (S_ISGITLINK(mode)) {
 -              htmlf("class='ls-mod'><a href='");
 +              htmlf("<a class='ls-mod' href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,
                              sha1_to_hex(sha1)));