summaryrefslogtreecommitdiffabout
authorJeffrey 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)
commite651cb0d2dc2dbd458c51cdba8ae56e8629348cc (patch) (side-by-side diff)
treeda70e147ef829797f0c152883abc59f8b40b1407
parent51a960a3ca6b0cade97db287a342996c3e1de48d (diff)
downloadcgit-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>
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
@@ -155,13 +155,13 @@ void html_fileperm(unsigned short mode)
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);
html_fileperm(mode >> 3);
html_fileperm(mode);
diff --git a/ui-diff.c b/ui-diff.c
index e6b957c..4695e3a 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -34,13 +34,13 @@ static void print_line(char *line, int len)
static void header(unsigned char *sha1, char *path1, int mode1,
unsigned char *sha2, char *path2, int mode2)
{
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/");
html_txt(path2);
@@ -75,16 +75,16 @@ 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))
cgit_print_error("Error running diff");
}
diff --git a/ui-tree.c b/ui-tree.c
index cb57d8d..21dd533 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -17,22 +17,22 @@ static int print_entry(const unsigned char *sha1, const char *base,
char *name;
enum object_type type;
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)));
} else if (S_ISDIR(mode)) {
html("class='ls-dir'><a href='");