Author: John Keeping <john@keeping.me.uk>
ui-diff: don't link to single file diff stat Seeing the diff stat for a single file is pretty useless, so reset the diff type before generating the links to individual files in the diff stat so that the links will show a useful diff. Reported-by: Konstantin Ryabitsev <mricon@kernel.org> Signed-off-by: John Keeping <john@keeping.me.uk>
ui-diff.c | 10 ++++++++++
diff --git a/ui-diff.c b/ui-diff.c index bf2ec57d33bfd18a476d36188816714d6cfd0d31..5b6df1ff972226e30a5fcf6418d21ec1e92f04dc 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -428,6 +428,16 @@ if (show_ctrls) cgit_print_diff_ctrls(); + /* + * Clicking on a link to a file in the diff stat should show a diff + * of the file, showing the diff stat limited to a single file is + * pretty useless. All links from this point on will be to + * individual files, so we simply reset the difftype in the query + * here to avoid propagating DIFF_STATONLY to the individual files. + */ + if (difftype == DIFF_STATONLY) + ctx.qry.difftype = ctx.cfg.difftype; + cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); if (difftype == DIFF_STATONLY)