summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
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 e6b957c..4695e3a 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -32,17 +32,17 @@ static void print_line(char *line, int len)
32} 32}
33 33
34static void header(unsigned char *sha1, char *path1, int mode1, 34static void header(unsigned char *sha1, char *path1, int mode1,
35 unsigned char *sha2, char *path2, int mode2) 35 unsigned char *sha2, char *path2, int mode2)
36{ 36{
37 char *abbrev1, *abbrev2; 37 char *abbrev1, *abbrev2;
38 int subproject; 38 int subproject;
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'>");
42 html("diff --git a/"); 42 html("diff --git a/");
43 html_txt(path1); 43 html_txt(path1);
44 html(" b/"); 44 html(" b/");
45 html_txt(path2); 45 html_txt(path2);
46 46
47 if (is_null_sha1(sha1)) 47 if (is_null_sha1(sha1))
48 path1 = "dev/null"; 48 path1 = "dev/null";
@@ -73,20 +73,20 @@ static void header(unsigned char *sha1, char *path1, int mode1,
73 } 73 }
74 html("</div>"); 74 html("</div>");
75} 75}
76 76
77static void filepair_cb(struct diff_filepair *pair) 77static void filepair_cb(struct diff_filepair *pair)
78{ 78{
79 header(pair->one->sha1, pair->one->path, pair->one->mode, 79 header(pair->one->sha1, pair->one->path, pair->one->mode,
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);
86 return; 86 return;
87 } 87 }
88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
89 cgit_print_error("Error running diff"); 89 cgit_print_error("Error running diff");
90} 90}
91 91
92void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) 92void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)