diff options
| author | John Keeping <john@keeping.me.uk> | 2014-12-29 22:27:55 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-12-30 10:09:25 +0100 |
| commit | d6c40507711ff6cc19c8fd3f28412845a33faf50 (patch) | |
| tree | 3676ebeac4941416d77a3ce589f0a4498ec5d4be | |
| parent | ui-patch: match git-format-patch(1) output (diff) | |
| download | cgit-pink-d6c40507711ff6cc19c8fd3f28412845a33faf50.tar.gz cgit-pink-d6c40507711ff6cc19c8fd3f28412845a33faf50.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | ui-diff.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c index bf2ec57..5b6df1f 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -428,6 +428,16 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, 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) |