all repos — cgit @ f2ced535e9f2c2ada7f184735a07a1190a9d810f

a hyperfast web frontend for git written in c 

Fix diff mode switching when side-by-side-diffs=1

When side-by-side-diffs=1 was set in cgitrc, specyfing 'ss=0' in the query-
string would not switch to unified diffs. This patch fixes the issue by
introducing a separate variable to track the occurrence of "ss" in the
querystring.
Tim Chen timchen1@gmail.com
Tue, 03 Jan 2012 16:02:14 +0000
commit

f2ced535e9f2c2ada7f184735a07a1190a9d810f

parent

0b6a716d1b9f18e8cc00940a7962e542b9358238

3 files changed, 3 insertions(+), 2 deletions(-)

jump to
M cgit.c → cgit.c 
@@ -281,6 +281,7 @@ } else if (!strcmp(name, "period")) {
 		ctx.qry.period = xstrdup(value);
 	} else if (!strcmp(name, "ss")) {
 		ctx.qry.ssdiff = atoi(value);
+		ctx.qry.has_ssdiff = 1;
 	} else if (!strcmp(name, "all")) {
 		ctx.qry.show_all = atoi(value);
 	} else if (!strcmp(name, "context")) {
M cgit.h → cgit.h 
@@ -133,6 +133,7 @@
 struct cgit_query {
 	int has_symref;
 	int has_sha1;
+	int has_ssdiff;
 	char *raw;
 	char *repo;
 	char *page;
M ui-diff.c → ui-diff.c 
@@ -372,8 +372,7 @@ return;
 		}
 	}
 
-	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-		use_ssdiff = 1;
+	use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
 
 	print_ssdiff_link();
 	cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);