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.
このコミットが含まれているのは:
コミット
f2ced535e9
1
cgit.c
1
cgit.c
@ -281,6 +281,7 @@ static void querystring_cb(const char *name, const char *value)
|
||||
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")) {
|
||||
|
1
cgit.h
1
cgit.h
@ -133,6 +133,7 @@ struct reflist {
|
||||
struct cgit_query {
|
||||
int has_symref;
|
||||
int has_sha1;
|
||||
int has_ssdiff;
|
||||
char *raw;
|
||||
char *repo;
|
||||
char *page;
|
||||
|
@ -372,8 +372,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
|
読み込み中…
新しいイシューから参照
ユーザーをブロックする