summaryrefslogtreecommitdiff
path: root/ui-diff.c
diff options
context:
space:
mode:
authorJeffrey C. Ollie <jeff@ocjtech.us>2007-06-04 17:28:56 +0000
committerLars Hjemli <hjemli@gmail.com>2007-06-04 17:58:32 +0000
commite651cb0d2dc2dbd458c51cdba8ae56e8629348cc (patch)
treeda70e147ef829797f0c152883abc59f8b40b1407 /ui-diff.c
parent51a960a3ca6b0cade97db287a342996c3e1de48d (diff)
downloadcgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar
cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.gz
cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.zip
Rename dirlink to gitlink.
Git changed from dirlink to gitlink in 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f. Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c8
1 files changed, 4 insertions, 4 deletions
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,
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;
}