cgit

commit ff13396926f3352d9e29c0663154918297dc5af7

Author: Lars Hjemli <hjemli@gmail.com>

Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

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

 html.c | 2 +-
 ui-diff.c | 8 ++++----
 ui-tree.c | 4 ++--


diff --git a/html.c b/html.c
index 33a956fd5db8140eed9c1a237d3db31337d76918..76fa6c4879a5b45b9462c8cab77905802ebcf7f4 100644
--- a/html.c
+++ b/html.c
@@ -158,7 +158,7 @@ 	if (S_ISDIR(mode))
 		html("d");
 	else if (S_ISLNK(mode))
 		html("l");
-	else if (S_ISDIRLNK(mode))
+	else if (S_ISGITLINK(mode))
 		html("m");
 	else
 		html("-");




diff --git a/ui-diff.c b/ui-diff.c
index a76a234cfe61b1fd63a7a3ccc1eb01ad6018b435..0be845fa41241656e936c2cab4704663c61fa66f 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -37,7 +37,7 @@ {
 	char *abbrev1, *abbrev2;
 	int subproject;
 
-	subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
+	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
 	html("<div class='head'>");
 	html("diff --git a/");
 	html_txt(path1);
@@ -78,10 +78,10 @@ static void filepair_cb(struct diff_filepair *pair)
 {
 	header(pair->one->sha1, pair->one->path, pair->one->mode,
 	       pair->two->sha1, pair->two->path, pair->two->mode);
-	if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
-		if (S_ISDIRLNK(pair->one->mode))
+	if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
+		if (S_ISGITLINK(pair->one->mode))
 			print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
-		if (S_ISDIRLNK(pair->two->mode))
+		if (S_ISGITLINK(pair->two->mode))
 			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 		return;
 	}




diff --git a/ui-tree.c b/ui-tree.c
index 634132f8d4554647cc4a87e46ad6fcb3d899a2aa..1cb09f717a56826dfd2cb132cdd78f72c3aad341 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -68,7 +68,7 @@ 	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));
@@ -78,7 +78,7 @@
 	html("<tr><td class='ls-mode'>");
 	html_filemode(mode);
 	html("</td><td>");
-	if (S_ISDIRLNK(mode)) {
+	if (S_ISGITLINK(mode)) {
 		htmlf("<a class='ls-mod' href='");
 		html_attr(fmt(cgit_repo->module_link,
 			      name,