simple-authentication.lua: tie secure cookies to field names

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index a4ade4dd2e032c215c24355f66fb7afd159cf55f..5b6df1ff972226e30a5fcf6418d21ec1e92f04dc 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -349,6 +349,7 @@ void cgit_print_diff_ctrls()
        curr = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;
        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
+       html_intoption(2, "stat only", curr);
        html("</select></td></tr>");
        html("<tr><td/><td class='ctrl'>");
        html("<noscript><input type='submit' value='reload'/></noscript>");
@@ -427,8 +428,21 @@ 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)
+               return;
+
        if (use_ssdiff) {
                html("<table summary='ssdiff' class='ssdiff'>");
        } else {