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>

diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
index 4e1236bfd979f25b7fcfa2c14d72a2541ef6a30a..a864612971aab367a1f8c6baf8254a3d8517ae6b 100755 (executable)
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -26,7 +26,7 @@ run_test 'get root commit' '
 '
 
 run_test 'root commit contains diffstat' '
 '
 
 run_test 'root commit contains diffstat' '

-        grep "<a href=./foo/diff/file-1.>file-1</a>" trash/tmp
+        grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp

 '
 
 run_test 'root commit contains diff' '
 '
 
 run_test 'root commit contains diff' '

diff --git a/ui-diff.c b/ui-diff.c
index 12e78b157a59651efce90718e6a2b16633abc6fa..1c182aa0eeed916ae1904a275c905017a599980c 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -145,6 +145,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
        html("<div class='diffstat-header'>Diffstat</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
        html("<div class='diffstat-header'>Diffstat</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;

+       curr_rev = xstrdup(sha1_to_hex(new_sha1));

        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);
        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);