author | Jeffrey C. Ollie <jeff@ocjtech.us> | 2007-06-04 17:28:56 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-04 17:58:32 (UTC) |
commit | e651cb0d2dc2dbd458c51cdba8ae56e8629348cc (patch) (side-by-side diff) | |
tree | da70e147ef829797f0c152883abc59f8b40b1407 /ui-diff.c | |
parent | 51a960a3ca6b0cade97db287a342996c3e1de48d (diff) | |
download | cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.zip cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.gz cgit-e651cb0d2dc2dbd458c51cdba8ae56e8629348cc.tar.bz2 |
Rename dirlink to gitlink.
Git changed from dirlink to gitlink in
302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.
Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
-rw-r--r-- | ui-diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -32,17 +32,17 @@ static void print_line(char *line, int len) } static void header(unsigned char *sha1, char *path1, int mode1, unsigned char *sha2, char *path2, int mode2) { 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); html(" b/"); html_txt(path2); if (is_null_sha1(sha1)) path1 = "dev/null"; @@ -73,20 +73,20 @@ static void header(unsigned char *sha1, char *path1, int mode1, } html("</div>"); } 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; } if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) cgit_print_error("Error running diff"); } void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) |