git: update to v2.2.1

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 8c4517d8e70554e02ac3cdaf8a246f2dad9dbfe0..796cb7fa9127ff2c9576e9567bc421fba9e498cb 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -237,7 +237,7 @@ static void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "side-by-side-diffs"))
-               ctx.cfg.ssdiff = atoi(value);
+               ctx.cfg.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;
        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "mimetype-file"))
@@ -312,9 +312,13 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.showmsg = atoi(value);
        } else if (!strcmp(name, "period")) {
                ctx.qry.period = xstrdup(value);
+       } else if (!strcmp(name, "dt")) {
+               ctx.qry.difftype = atoi(value);
+               ctx.qry.has_difftype = 1;
        } else if (!strcmp(name, "ss")) {
-               ctx.qry.ssdiff = atoi(value);
-               ctx.qry.has_ssdiff = 1;
+               /* No longer generated, but there may be links out there. */
+               ctx.qry.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;
+               ctx.qry.has_difftype = 1;
        } else if (!strcmp(name, "all")) {
                ctx.qry.show_all = atoi(value);
        } else if (!strcmp(name, "context")) {
@@ -372,7 +376,7 @@ static void prepare_context(void)
        ctx.cfg.summary_log = 10;
        ctx.cfg.summary_tags = 10;
        ctx.cfg.max_atom_items = 10;
-       ctx.cfg.ssdiff = 0;
+       ctx.cfg.difftype = DIFF_UNIFIED;
        ctx.env.cgit_config = getenv("CGIT_CONFIG");
        ctx.env.http_host = getenv("HTTP_HOST");
        ctx.env.https = getenv("HTTPS");
@@ -453,7 +457,7 @@ static char *guess_defbranch(void)
        const char *ref;
        unsigned char sha1[20];
 
-       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
+       ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
        if (!ref || !starts_with(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);