From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 3 Sep 2007 21:00:06 +0000 (+0200)
Subject: Merge branch 'jo/dirlink'
X-Git-Tag: v0.6~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff13396926f3352d9e29c0663154918297dc5af7;p=cgit

Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

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

ff13396926f3352d9e29c0663154918297dc5af7
diff --cc ui-tree.c
index 634132f,21dd533..1cb09f7
--- a/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)));