summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--html.c2
-rw-r--r--ui-diff.c8
-rw-r--r--ui-tree.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/html.c b/html.c
index 33a956f..76fa6c4 100644
--- a/html.c
+++ b/html.c
@@ -159,5 +159,5 @@ void html_filemode(unsigned short mode)
else if (S_ISLNK(mode))
html("l");
- else if (S_ISDIRLNK(mode))
+ else if (S_ISGITLINK(mode))
html("m");
else
diff --git a/ui-diff.c b/ui-diff.c
index a76a234..0be845f 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -38,5 +38,5 @@ static void header(unsigned char *sha1, char *path1, int mode1,
int subproject;
- subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
+ subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
html("<div class='head'>");
html("diff --git a/");
@@ -79,8 +79,8 @@ 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 634132f..1cb09f7 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -69,5 +69,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
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,
@@ -79,5 +79,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
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,