mirror of
https://git.zx2c4.com/cgit
synced 2024-11-09 10:08:42 +00:00
Rename dirlink to gitlink.
Git changed from dirlink to gitlink in 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f. Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
This commit is contained in:
parent
51a960a3ca
commit
e651cb0d2d
2
html.c
2
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("-");
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user