diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:27 +0900 |
| commit | 8cc633286a4803025d84b77c808a2c7ad8616f2f (patch) | |
| tree | 624047e4917cd5113dad8f487dd8dec21985c775 /patch-ids.c | |
| parent | bde13700105a1c945819578ce8d5c0627d52c741 (diff) | |
| parent | 0d1e0e7801bb2ae22036ad09f9f5cec17e08c48b (diff) | |
| download | git-8cc633286a4803025d84b77c808a2c7ad8616f2f.tar.gz git-8cc633286a4803025d84b77c808a2c7ad8616f2f.tar.xz | |
Merge branch 'bw/diff-opt-impl-to-bitfields'
A single-word "unsigned flags" in the diff options is being split
into a structure with many bitfields.
* bw/diff-opt-impl-to-bitfields:
diff: make struct diff_flags members lowercase
diff: remove DIFF_OPT_CLR macro
diff: remove DIFF_OPT_SET macro
diff: remove DIFF_OPT_TST macro
diff: remove touched flags
diff: add flag to indicate textconv was set via cmdline
diff: convert flags to be stored in bitfields
add, reset: use DIFF_OPT_SET macro to set a diff flag
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 7a583b301..8f7c25d5d 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -61,7 +61,7 @@ int init_patch_ids(struct patch_ids *ids) memset(ids, 0, sizeof(*ids)); diff_setup(&ids->diffopts); ids->diffopts.detect_rename = 0; - DIFF_OPT_SET(&ids->diffopts, RECURSIVE); + ids->diffopts.flags.recursive = 1; diff_setup_done(&ids->diffopts); hashmap_init(&ids->patches, patch_id_cmp, &ids->diffopts, 256); return 0; |