History

Rename dirlink to gitlink.

Git changed from dirlink to gitlink in 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.

Jeffrey C. Ollie committed 19 years ago

Commit e651cb01 parent 51a960a3 files · +7 −7Browse files

Unified · Split

3 files
  1. html.c +1 −1
  2. ui-diff.c +4 −4
  3. ui-tree.c +2 −2
html.c+1−1
@@ -158,7 +158,7 @@ void html_filemode(unsigned short mode) · 157 unmodified lines
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 else163 else
164 html("-");164 html("-");
ui-diff.c+4−4
@@ -37,7 +37,7 @@ static void header(unsigned char *sha1, char *path1, int mode1, · 36 unmodified lines
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) · 34 unmodified lines
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 }
ui-tree.c+2−2
@@ -20,7 +20,7 @@ static int print_entry(const unsigned char *sha1, const char *base, · 19 unmodified lines
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, · 2 unmodified lines
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,