diff options
Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 8 |
1 files changed, 5 insertions, 3 deletions
| @@ -345,8 +345,8 @@ void cgit_print_diff_ctrls() | |||
| 345 | html("</tr><tr>"); | 345 | html("</tr><tr>"); |
| 346 | html("<td class='label'>mode:</td>"); | 346 | html("<td class='label'>mode:</td>"); |
| 347 | html("<td class='ctrl'>"); | 347 | html("<td class='ctrl'>"); |
| 348 | html("<select name='ss' onchange='this.form.submit();'>"); | 348 | html("<select name='dt' onchange='this.form.submit();'>"); |
| 349 | curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff; | 349 | curr = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype; |
| 350 | html_intoption(0, "unified", curr); | 350 | html_intoption(0, "unified", curr); |
| 351 | html_intoption(1, "ssdiff", curr); | 351 | html_intoption(1, "ssdiff", curr); |
| 352 | html("</select></td></tr>"); | 352 | html("</select></td></tr>"); |
| @@ -362,6 +362,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
| 362 | { | 362 | { |
| 363 | struct commit *commit, *commit2; | 363 | struct commit *commit, *commit2; |
| 364 | const unsigned char *old_tree_sha1, *new_tree_sha1; | 364 | const unsigned char *old_tree_sha1, *new_tree_sha1; |
| 365 | diff_type difftype; | ||
| 365 | 366 | ||
| 366 | if (!new_rev) | 367 | if (!new_rev) |
| 367 | new_rev = ctx.qry.head; | 368 | new_rev = ctx.qry.head; |
| @@ -420,7 +421,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, | |||
| 420 | return; | 421 | return; |
| 421 | } | 422 | } |
| 422 | 423 | ||
| 423 | use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff; | 424 | difftype = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype; |
| 425 | use_ssdiff = difftype == DIFF_SSDIFF; | ||
| 424 | 426 | ||
| 425 | if (show_ctrls) | 427 | if (show_ctrls) |
| 426 | cgit_print_diff_ctrls(); | 428 | cgit_print_diff_ctrls(); |
