summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
authorLars Hjemli <hjemli@gmail.com>2007-09-03 21:00:06 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-09-03 21:00:06 (UTC)
commitff13396926f3352d9e29c0663154918297dc5af7 (patch) (unidiff)
tree71979efc1ad17ab15a365f86ecb49dd128c65772 /ui-diff.c
parent4e7e8bf9616661bec0c9b9d9c50aca03e600f32b (diff)
parente651cb0d2dc2dbd458c51cdba8ae56e8629348cc (diff)
downloadcgit-ff13396926f3352d9e29c0663154918297dc5af7.zip
cgit-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>
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index a76a234..0be845f 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -39,3 +39,3 @@ static void header(unsigned char *sha1, char *path1, int mode1,
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'>");
@@ -80,6 +80,6 @@ static void filepair_cb(struct diff_filepair *pair)
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);