author | Jeffrey C. Ollie <jeff@ocjtech.us> | 2007-06-04 17:28:56 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-04 17:58:32 (UTC) |
commit | e651cb0d2dc2dbd458c51cdba8ae56e8629348cc (patch) (side-by-side diff) | |
tree | da70e147ef829797f0c152883abc59f8b40b1407 | |
parent | 51a960a3ca6b0cade97db287a342996c3e1de48d (diff) | |
download | cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.zip cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.gz cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.bz2 |
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
@@ -157,9 +157,9 @@ void html_filemode(unsigned short mode) 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("-"); html_fileperm(mode >> 6); @@ -36,9 +36,9 @@ 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); html(" b/"); @@ -77,12 +77,12 @@ static void header(unsigned char *sha1, char *path1, int mode1, 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; } if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) @@ -19,18 +19,18 @@ static int print_entry(const unsigned char *sha1, const char *base, 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)); return 0; } 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, sha1_to_hex(sha1))); |