summaryrefslogtreecommitdiff
path: root/diffcore-break.c
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2020-04-07 22:11:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-07 23:09:29 (GMT)
commit1c37e86ab2834dfca311799e799568794bc474ce (patch)
tree591e447109aed7b2dc9d6cee2e7826c04de70803 /diffcore-break.c
parentdb7ed7418b3702ab2b2df755764c3f452917a890 (diff)
downloadgit-1c37e86ab2834dfca311799e799568794bc474ce.zip
git-1c37e86ab2834dfca311799e799568794bc474ce.tar.gz
git-1c37e86ab2834dfca311799e799568794bc474ce.tar.bz2
diff: make diff_populate_filespec_options struct
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>
Diffstat (limited to 'diffcore-break.c')
-rw-r--r--diffcore-break.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-break.c b/diffcore-break.c
index 9d20a6a..e8f6322 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -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);