aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey C. Ollie2007-06-04 12:28:56 -0500
committerLars Hjemli2007-06-04 19:58:32 +0200
commite651cb0d2dc2dbd458c51cdba8ae56e8629348cc (patch)
treeda70e147ef829797f0c152883abc59f8b40b1407
parent51a960a3ca6b0cade97db287a342996c3e1de48d (diff)
downloadcgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.gz
cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.bz2
cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.zip
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.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
@@ -158,7 +158,7 @@ void html_filemode(unsigned short mode)
158 html("d"); 158 html("d");
159 else if (S_ISLNK(mode)) 159 else if (S_ISLNK(mode))
160 html("l"); 160 html("l");
161 else if (S_ISDIRLNK(mode)) 161 else if (S_ISGITLINK(mode))
162 html("m"); 162 html("m");
163 else 163 else
164 html("-"); 164 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,
37 char *abbrev1, *abbrev2; 37 char *abbrev1, *abbrev2;
38 int subproject; 38 int subproject;
39 39
40 subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); 40 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
41 html("<div class='head'>"); 41 html("<div class='head'>");
42 html("diff --git a/"); 42 html("diff --git a/");
43 html_txt(path1); 43 html_txt(path1);
@@ -78,10 +78,10 @@ static void filepair_cb(struct diff_filepair *pair)
78{ 78{
79 header(pair->one->sha1, pair->one->path, pair->one->mode, 79 header(pair->one->sha1, pair->one->path, pair->one->mode,
80 pair->two->sha1, pair->two->path, pair->two->mode); 80 pair->two->sha1, pair->two->path, pair->two->mode);
81 if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) { 81 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
82 if (S_ISDIRLNK(pair->one->mode)) 82 if (S_ISGITLINK(pair->one->mode))
83 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 83 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
84 if (S_ISDIRLNK(pair->two->mode)) 84 if (S_ISGITLINK(pair->two->mode))
85 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 85 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
86 return; 86 return;
87 } 87 }
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,
20 20
21 name = xstrdup(pathname); 21 name = xstrdup(pathname);
22 type = sha1_object_info(sha1, &size); 22 type = sha1_object_info(sha1, &size);
23 if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { 23 if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
24 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 24 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
25 name, 25 name,
26 sha1_to_hex(sha1)); 26 sha1_to_hex(sha1));
@@ -29,7 +29,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
29 html("<tr><td class='filemode'>"); 29 html("<tr><td class='filemode'>");
30 html_filemode(mode); 30 html_filemode(mode);
31 html("</td><td "); 31 html("</td><td ");
32 if (S_ISDIRLNK(mode)) { 32 if (S_ISGITLINK(mode)) {
33 htmlf("class='ls-mod'><a href='"); 33 htmlf("class='ls-mod'><a href='");
34 html_attr(fmt(cgit_repo->module_link, 34 html_attr(fmt(cgit_repo->module_link,
35 name, 35 name,