proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-10 03:56:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf

Browse Source
This commit is contained in:
Pierre-Olivier Latour 2014-10-26 10:40:46 -07:00
parent 116a19d467
commit d88766c4e1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -107,3 +107,8 @@ v0.21 + 1
* The THREADSAFE option to build libgit2 with threading support has * The THREADSAFE option to build libgit2 with threading support has
been flipped to be on by default. been flipped to be on by default.
* The context_lines and interhunk_lines fields in git_diff_options are
now uint32_t instead of uint16_t. This allows to set them to UINT_MAX,
in effect asking for "infinite" context e.g. to iterate over all the
unmodified lines of a diff.

4
include/git2/diff.h
View File

@ -377,8 +377,8 @@ typedef struct {
/* options controlling how to diff text is generated */ /* options controlling how to diff text is generated */
uint16_t context_lines; /**< defaults to 3 */ uint32_t context_lines; /**< defaults to 3 */
uint16_t interhunk_lines; /**< defaults to 0 */ uint32_t interhunk_lines; /**< defaults to 0 */
uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */ uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */
git_off_t max_size; /**< defaults to 512MB */ git_off_t max_size; /**< defaults to 512MB */
const char *old_prefix; /**< defaults to "a" */ const char *old_prefix; /**< defaults to "a" */

2
src/diff.c
View File

@ -439,7 +439,7 @@ static int diff_list_apply_options(
/* If not given explicit `opts`, check `diff.xyz` configs */ /* If not given explicit `opts`, check `diff.xyz` configs */
if (!opts) { if (!opts) {
int context = git_config__get_int_force(cfg, "diff.context", 3); int context = git_config__get_int_force(cfg, "diff.context", 3);
diff->opts.context_lines = context >= 0 ? (uint16_t)context : 3; diff->opts.context_lines = context >= 0 ? (uint32_t)context : 3;
/* add other defaults here */ /* add other defaults here */
} }