mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-09 18:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jo/dirlink'

Browse Source 
* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-09-03 23:00:06 +02:00
commit ff13396926
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html.c
View File

@ -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("-");

8
ui-diff.c
View File

@ -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;
}

4
ui-tree.c
View File

@ -68,7 +68,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
cgit_query_path ? "/" : "", name);
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));
@ -78,7 +78,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
html("<tr><td class='ls-mode'>");
html_filemode(mode);
html("</td><td>");
if (S_ISDIRLNK(mode)) {
if (S_ISGITLINK(mode)) {
htmlf("<a class='ls-mod' href='");
html_attr(fmt(cgit_repo->module_link,
name,