diff options
| author | Vicent Martà <vicent@github.com> | 2013-09-21 20:34:03 +0400 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-09-21 20:34:03 +0400 |
| commit | 92d19d16711c059c768063956abd31db346d2e7b (patch) | |
| tree | 2110237444fb9e24463f159675734f1dd6f0a028 /src/diff.c | |
| parent | daef29ea3ed84c2ec558c46fa08077b5b55fe63d (diff) | |
| parent | 66566516ce5171111ea4c5a8160adb4b0b0dc675 (diff) | |
Merge pull request #1840 from linquize/warning
Fix warning
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c index 4d9ace183..39facce60 100644 --- a/src/diff.c +++ b/src/diff.c @@ -440,7 +440,8 @@ static int diff_list_apply_options( /* If not given explicit `opts`, check `diff.xyz` configs */ if (!opts) { - diff->opts.context_lines = config_int(cfg, "diff.context", 3); + int context = config_int(cfg, "diff.context", 3); + diff->opts.context_lines = context >= 0 ? (uint16_t)context : 3; /* add other defaults here */ } |