diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 23:00:06 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 23:00:06 +0200 |
| commit | ff13396926f3352d9e29c0663154918297dc5af7 (patch) | |
| tree | 71979efc1ad17ab15a365f86ecb49dd128c65772 /ui-diff.c | |
| parent | Use git-1.5.3 as submodule (diff) | |
| parent | Rename dirlink to gitlink. (diff) | |
| download | cgit-pink-ff13396926f3352d9e29c0663154918297dc5af7.tar.gz cgit-pink-ff13396926f3352d9e29c0663154918297dc5af7.zip | |
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 '')
| -rw-r--r-- | ui-diff.c | 8 |
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 @@ -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; } |