diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:50:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:50:16 -0800 |
| commit | e6cb314c087661a535b8873502b6d40cef1bbd57 (patch) | |
| tree | b097ca74690e1d6bf8a95b5162eb95ec931ad5ed /merge-recursive.c | |
| parent | 41d8a5f0f7db6e1d92f925234eb8c55d2d34a5af (diff) | |
| parent | d054680c7d245b71ebba0dd030fd13dce213559a (diff) | |
| download | git-e6cb314c087661a535b8873502b6d40cef1bbd57.tar.gz | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6c6f595fbc..9a1e2f269d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -366,7 +366,7 @@ static struct path_list *get_renames(struct tree *tree, renames = xcalloc(1, sizeof(struct path_list)); diff_setup(&opts); - opts.recursive = 1; + DIFF_OPT_SET(&opts, RECURSIVE); opts.detect_rename = DIFF_DETECT_RENAME; opts.rename_limit = rename_limit; opts.output_format = DIFF_FORMAT_NO_OUTPUT; |