| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 21:00:06 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 21:00:06 (UTC) |
| commit | ff13396926f3352d9e29c0663154918297dc5af7 (patch) (side-by-side diff) | |
| tree | 71979efc1ad17ab15a365f86ecb49dd128c65772 /ui-diff.c | |
| parent | 4e7e8bf9616661bec0c9b9d9c50aca03e600f32b (diff) | |
| parent | e651cb0d2dc2dbd458c51cdba8ae56e8629348cc (diff) | |
| download | cgit-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>
| -rw-r--r-- | ui-diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -38,5 +38,5 @@ static void header(unsigned char *sha1, char *path1, int mode1, int subproject; - subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); + subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); html("<div class='head'>"); html("diff --git a/"); @@ -79,8 +79,8 @@ 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; |