diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-19 02:50:16 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-19 02:50:16 +0300 |
| commit | e6cb314c087661a535b8873502b6d40cef1bbd57 (patch) | |
| tree | b097ca74690e1d6bf8a95b5162eb95ec931ad5ed /patch-ids.c | |
| parent | 41d8a5f0f7db6e1d92f925234eb8c55d2d34a5af (diff) | |
| parent | d054680c7d245b71ebba0dd030fd13dce213559a (diff) | |
Merge branch 'ph/diffopts'
* ph/diffopts:
Reorder diff_opt_parse options more logically per topics.
Make the diff_options bitfields be an unsigned with explicit masks.
Use OPT_BIT in builtin-pack-refs
Use OPT_BIT in builtin-for-each-ref
Use OPT_SET_INT and OPT_BIT in builtin-branch
parse-options new features.
Diffstat (limited to 'patch-ids.c')
| -rw-r--r-- | patch-ids.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-ids.c b/patch-ids.c index a288fac992..3be5d3165e 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -121,7 +121,7 @@ int init_patch_ids(struct patch_ids *ids) { memset(ids, 0, sizeof(*ids)); diff_setup(&ids->diffopts); - ids->diffopts.recursive = 1; + DIFF_OPT_SET(&ids->diffopts, RECURSIVE); if (diff_setup_done(&ids->diffopts) < 0) return error("diff_setup_done failed"); return 0; |