summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-05-18 19:21:32 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-05-18 19:33:30 (UTC)
commit8907f2a03195abec409540ab11293fe748468413 (patch) (unidiff)
tree98b8d269408f6ffcda3a2ebfa6c709565e0f1c2a
parent502d57596e645ec91bb9b8ca62833cdb0de4a3b1 (diff)
downloadcgit-8907f2a03195abec409540ab11293fe748468413.zip
cgit-8907f2a03195abec409540ab11293fe748468413.tar.gz
cgit-8907f2a03195abec409540ab11293fe748468413.tar.bz2
Include commit-id in link from diff-stat
This fixes a regression created by fe1230dece81450004d02fa8a470f8dab8f7fdd9, and modifies a test to avoid future regressions. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xtests/t0105-commit.sh2
-rw-r--r--ui-diff.c1
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
@@ -23,13 +23,13 @@ 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
28run_test 'root commit contains diffstat' ' 28run_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
32run_test 'root commit contains diff' ' 32run_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'
diff --git a/ui-diff.c b/ui-diff.c
index 12e78b1..1c182aa 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -142,12 +142,13 @@ void cgit_print_diffstat(const unsigned char *old_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",