diff options
| author | John Keeping | 2014-12-29 22:27:55 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld | 2014-12-30 10:09:25 +0100 |
| commit | d6c40507711ff6cc19c8fd3f28412845a33faf50 (patch) | |
| tree | 3676ebeac4941416d77a3ce589f0a4498ec5d4be | |
| parent | 7552266aaccb9445e082fc04215afcb55ad543d8 (diff) | |
| download | cgit-d6c40507711ff6cc19c8fd3f28412845a33faf50.tar.gz cgit-d6c40507711ff6cc19c8fd3f28412845a33faf50.tar.bz2 cgit-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>
| -rw-r--r-- | ui-diff.c | 10 |
1 files changed, 10 insertions, 0 deletions
| @@ -428,6 +428,16 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
| 428 | if (show_ctrls) | 428 | if (show_ctrls) |
| 429 | cgit_print_diff_ctrls(); | 429 | cgit_print_diff_ctrls(); |
| 430 | 430 | ||
| 431 | /* | ||
| 432 | * Clicking on a link to a file in the diff stat should show a diff | ||
| 433 | * of the file, showing the diff stat limited to a single file is | ||
| 434 | * pretty useless. All links from this point on will be to | ||
| 435 | * individual files, so we simply reset the difftype in the query | ||
| 436 | * here to avoid propagating DIFF_STATONLY to the individual files. | ||
| 437 | */ | ||
| 438 | if (difftype == DIFF_STATONLY) | ||
| 439 | ctx.qry.difftype = ctx.cfg.difftype; | ||
| 440 | |||
| 431 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); | 441 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); |
| 432 | 442 | ||
| 433 | if (difftype == DIFF_STATONLY) | 443 | if (difftype == DIFF_STATONLY) |
