diff options
| author | Jeffrey C. Ollie <jeff@ocjtech.us> | 2007-06-04 12:28:56 -0500 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-04 19:58:32 +0200 |
| commit | e651cb0d2dc2dbd458c51cdba8ae56e8629348cc (patch) | |
| tree | da70e147ef829797f0c152883abc59f8b40b1407 | |
| parent | 51a960a3ca6b0cade97db287a342996c3e1de48d (diff) | |
Rename dirlink to gitlink.
Git changed from dirlink to gitlink in 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f. Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
| -rw-r--r-- | html.c | 2 | ||||
| -rw-r--r-- | ui-diff.c | 8 | ||||
| -rw-r--r-- | ui-tree.c | 4 |
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 @@ -158,7 +158,7 @@ void html_filemode(unsigned short 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 e6b957c..4695e3a 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -37,7 +37,7 @@ static void header(unsigned char *sha1, char *path1, int mode1, 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 cb57d8d..21dd533 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -20,7 +20,7 @@ static int print_entry(const unsigned char *sha1, const char *base, 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 @@ static int print_entry(const unsigned char *sha1, const char *base, 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, |