diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2020-04-08 01:11:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-08 02:09:29 +0300 |
| commit | 1c37e86ab2834dfca311799e799568794bc474ce (patch) | |
| tree | 591e447109aed7b2dc9d6cee2e7826c04de70803 /diffcore-break.c | |
| parent | db7ed7418b3702ab2b2df755764c3f452917a890 (diff) | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index 9d20a6a6fc..e8f6322c6a 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); |