Author: Jeffrey C. Ollie <jeff@ocjtech.us>
Rename dirlink to gitlink. Git changed from dirlink to gitlink in 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f. Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
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 e6b957c5b61f0ca764efc6a7d4d66dd941f47c67..4695e3a6442cb1b7bc1e2bbc75291e066d24a013 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 cb57d8d13aa182f244e479207b656de82ae13a9c..21dd533cf8edfb9432cd8a88d9f5d762340e7462 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -20,7 +20,7 @@ unsigned long size = 0; name = xstrdup(pathname); 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)); @@ -29,7 +29,7 @@ } html("<tr><td class='filemode'>"); html_filemode(mode); html("</td><td "); - if (S_ISDIRLNK(mode)) { + if (S_ISGITLINK(mode)) { htmlf("class='ls-mod'><a href='"); html_attr(fmt(cgit_repo->module_link, name,