-rwxr-xr-x | tests/t0105-commit.sh | 2 | ||||
-rw-r--r-- | ui-diff.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index 4e1236b..a864612 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh | |||
@@ -17,21 +17,21 @@ run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" | |||
17 | 17 | ||
18 | run_test 'find diff summary' ' | 18 | run_test 'find diff summary' ' |
19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp | 19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp |
20 | ' | 20 | ' |
21 | 21 | ||
22 | run_test 'get root commit' ' | 22 | run_test 'get root commit' ' |
23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && | 23 | root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && |
24 | cgit_url "foo/commit&id=$root" >trash/tmp && | 24 | cgit_url "foo/commit&id=$root" >trash/tmp && |
25 | grep "</html>" trash/tmp | 25 | grep "</html>" trash/tmp |
26 | ' | 26 | ' |
27 | 27 | ||
28 | run_test 'root commit contains diffstat' ' | 28 | run_test 'root commit contains diffstat' ' |
29 | grep "<a href=./foo/diff/file-1.>file-1</a>" trash/tmp | 29 | grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp |
30 | ' | 30 | ' |
31 | 31 | ||
32 | run_test 'root commit contains diff' ' | 32 | run_test 'root commit contains diff' ' |
33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && | 33 | grep ">diff --git a/file-1 b/file-1<" trash/tmp && |
34 | grep -e "<div class=.add.>+1</div>" trash/tmp | 34 | grep -e "<div class=.add.>+1</div>" trash/tmp |
35 | ' | 35 | ' |
36 | 36 | ||
37 | tests_done | 37 | tests_done |
@@ -136,24 +136,25 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
136 | total_adds += lines_added; | 136 | total_adds += lines_added; |
137 | total_rems += lines_removed; | 137 | total_rems += lines_removed; |
138 | } | 138 | } |
139 | 139 | ||
140 | void cgit_print_diffstat(const unsigned char *old_sha1, | 140 | void cgit_print_diffstat(const unsigned char *old_sha1, |
141 | const unsigned char *new_sha1) | 141 | const unsigned char *new_sha1) |
142 | { | 142 | { |
143 | int i; | 143 | int i; |
144 | 144 | ||
145 | html("<div class='diffstat-header'>Diffstat</div>"); | 145 | html("<div class='diffstat-header'>Diffstat</div>"); |
146 | html("<table summary='diffstat' class='diffstat'>"); | 146 | html("<table summary='diffstat' class='diffstat'>"); |
147 | max_changes = 0; | 147 | max_changes = 0; |
148 | curr_rev = xstrdup(sha1_to_hex(new_sha1)); | ||
148 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); | 149 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
149 | for(i = 0; i<files; i++) | 150 | for(i = 0; i<files; i++) |
150 | print_fileinfo(&items[i]); | 151 | print_fileinfo(&items[i]); |
151 | html("</table>"); | 152 | html("</table>"); |
152 | html("<div class='diffstat-summary'>"); | 153 | html("<div class='diffstat-summary'>"); |
153 | htmlf("%d files changed, %d insertions, %d deletions", | 154 | htmlf("%d files changed, %d insertions, %d deletions", |
154 | files, total_adds, total_rems); | 155 | files, total_adds, total_rems); |
155 | html("</div>"); | 156 | html("</div>"); |
156 | } | 157 | } |
157 | 158 | ||
158 | 159 | ||
159 | /* | 160 | /* |