mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: make diff_populate_filespec_options struct

Browse Source 
The behavior of diff_populate_filespec() currently can be customized
through a bitflag, but a subsequent patch requires it to support a
non-boolean option. Replace the bitflag with an options struct.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan
2020-04-07 15:11:41 -07:00
committed by Junio C Hamano
parent db7ed7418b
commit 1c37e86ab2
5 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diffcore-break.c
View File

@ -62,8 +62,8 @@ static int should_break(struct repository *r,
oideq(&src->oid, &dst->oid))
return 0; /* they are the same */
if (diff_populate_filespec(r, src, 0) ||
diff_populate_filespec(r, dst, 0))
if (diff_populate_filespec(r, src, NULL) ||
diff_populate_filespec(r, dst, NULL))
return 0; /* error but caught downstream */
max_size = ((src->size > dst->size) ? src->size : dst->size);