proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-27 22:41:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

diff: change id abbrev option's name to id_abbrev

Browse Source 
Same as the other commits in the series, we use 'id' when talking about
thing rather than the datatype.
This commit is contained in:
Carlos Martín Nieto 2014-01-24 20:30:10 +01:00
parent 9950bb4e8d
commit 86bfc3e1c6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/git2/diff.h
View File

@ -361,7 +361,7 @@ typedef struct {
uint16_t context_lines; /**< defaults to 3 */
uint16_t interhunk_lines; /**< defaults to 0 */
uint16_t oid_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 */
const char *old_prefix; /**< defaults to "a" */
const char *new_prefix; /**< defaults to "b" */

4
src/diff_print.c
View File

@ -37,8 +37,8 @@ static int diff_print_info_init(
if (diff)
pi->flags = diff->opts.flags;
if (diff && diff->opts.oid_abbrev != 0)
pi->oid_strlen = diff->opts.oid_abbrev;
if (diff && diff->opts.id_abbrev != 0)
pi->oid_strlen = diff->opts.id_abbrev;
else if (!diff || !diff->repo)
pi->oid_strlen = GIT_ABBREV_DEFAULT;
else if (git_repository__cvar(