diff options
| author | Johan Herland | 2010-06-24 17:52:57 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2010-07-18 10:53:48 +0200 |
| commit | 2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch) | |
| tree | 48d555b15c0432bb98712d746100bf6c0fe2be4a /ui-patch.c | |
| parent | ui-diff: Add links to increase/decrease number of context lines in diffs (diff) | |
| download | cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.gz cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.zip | |
Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and cgit_diff_tree() to Git's diff machinery. This is equivalent to passing --ignore-all-space to 'git diff'. Signed-off-by: Johan Herland <johan@herland.net>
Diffstat (limited to 'ui-patch.c')
| -rw-r--r-- | ui-patch.c | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/ui-patch.c b/ui-patch.c index d13104c..ca008f3 100644 --- a/ui-patch.c +++ b/ui-patch.c | |||
| @@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair) | |||
| 71 | return; | 71 | return; |
| 72 | } | 72 | } |
| 73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
| 74 | &new_size, &binary, 0, print_line)) | 74 | &new_size, &binary, 0, 0, print_line)) |
| 75 | html("Error running diff"); | 75 | html("Error running diff"); |
| 76 | if (binary) | 76 | if (binary) |
| 77 | html("Binary files differ\n"); | 77 | html("Binary files differ\n"); |
| @@ -124,7 +124,7 @@ void cgit_print_patch(char *hex, const char *prefix) | |||
| 124 | html("---\n"); | 124 | html("---\n"); |
| 125 | if (prefix) | 125 | if (prefix) |
| 126 | htmlf("(limited to '%s')\n\n", prefix); | 126 | htmlf("(limited to '%s')\n\n", prefix); |
| 127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); | 127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0); |
| 128 | html("--\n"); | 128 | html("--\n"); |
| 129 | htmlf("cgit %s\n", CGIT_VERSION); | 129 | htmlf("cgit %s\n", CGIT_VERSION); |
| 130 | cgit_free_commitinfo(info); | 130 | cgit_free_commitinfo(info); |