diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2019-08-17 21:41:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 20:08:03 +0300 |
| commit | 8e01251694fa277df53e5c52c137f0b4134d2cd5 (patch) | |
| tree | 83841c6049011be15ce34aed8f0fb7564725f9dc /merge-recursive.h | |
| parent | 743474cbfa8b65016dd02b4e56dd9f47f95652c3 (diff) | |
merge-recursive: introduce an enum for detect_directory_renames values
Improve code readability by introducing an enum to replace the
not-quite-boolean values taken on by detect_directory_renames.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index c2b7bb65c6..f1b6ef38ae 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -22,7 +22,11 @@ struct merge_options { unsigned renormalize : 1; long xdl_opts; int verbosity; - int detect_directory_renames; + enum { + MERGE_DIRECTORY_RENAMES_NONE = 0, + MERGE_DIRECTORY_RENAMES_CONFLICT = 1, + MERGE_DIRECTORY_RENAMES_TRUE = 2 + } detect_directory_renames; int diff_detect_rename; int merge_detect_rename; int diff_rename_limit; |