aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-03 23:00:06 +0200
committerLars Hjemli <hjemli@gmail.com>2007-09-03 23:00:06 +0200
commitff13396926f3352d9e29c0663154918297dc5af7 (patch)
tree71979efc1ad17ab15a365f86ecb49dd128c65772
parent4e7e8bf9616661bec0c9b9d9c50aca03e600f32b (diff)
parente651cb0d2dc2dbd458c51cdba8ae56e8629348cc (diff)
downloadcgit-ff13396926f3352d9e29c0663154918297dc5af7.tar.gz
cgit-ff13396926f3352d9e29c0663154918297dc5af7.tar.bz2
Merge branch 'jo/dirlink'
* jo/dirlink: Rename dirlink to gitlink. Conflicts: ui-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-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)
html("d");
else if (S_ISLNK(mode))
html("l");
- else if (S_ISDIRLNK(mode))
+ else if (S_ISGITLINK(mode))
html("m");
else
html("-");
diff --git a/ui-diff.c b/ui-diff.c
index a76a234..0be845f 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -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;
}
diff --git a/ui-tree.c b/ui-tree.c
index 634132f..1cb09f7 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -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,