diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 17:00:09 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:05 -0500 |
| commit | fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3 (patch) | |
| tree | 53dbcd502af2400529a3f8db828612d90d12cf06 /src/merge.c | |
| parent | c4f60543b7ccfce852ebdc8c12b62c99a5d4c2a5 (diff) | |
| download | libgit2-fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3.tar.gz | |
merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/merge.c b/src/merge.c index bad5f9552..d7b23e2c8 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1296,7 +1296,7 @@ int git_merge_diff_list__find_renames( assert(diff_list && opts); - if ((opts->tree_flags & GIT_MERGE_TREE_FIND_RENAMES) == 0) + if ((opts->flags & GIT_MERGE_FIND_RENAMES) == 0) return 0; similarity_ours = git__calloc(diff_list->conflicts.length, @@ -1632,8 +1632,8 @@ static int merge_normalize_opts( git_merge_options init = GIT_MERGE_OPTIONS_INIT; memcpy(opts, &init, sizeof(init)); - opts->tree_flags = GIT_MERGE_TREE_FIND_RENAMES; - opts->rename_threshold = GIT_MERGE_TREE_RENAME_THRESHOLD; + opts->flags = GIT_MERGE_FIND_RENAMES; + opts->rename_threshold = GIT_MERGE_DEFAULT_RENAME_THRESHOLD; } if (!opts->target_limit) { @@ -1643,7 +1643,7 @@ static int merge_normalize_opts( limit = git_config__get_int_force(cfg, "diff.renamelimit", 0); opts->target_limit = (limit <= 0) ? - GIT_MERGE_TREE_TARGET_LIMIT : (unsigned int)limit; + GIT_MERGE_DEFAULT_TARGET_LIMIT : (unsigned int)limit; } /* assign the internal metric with whitespace flag as payload */ @@ -1864,7 +1864,7 @@ int git_merge__iterators( goto done; if (!resolved) { - if ((opts.tree_flags & GIT_MERGE_TREE_FAIL_ON_CONFLICT)) { + if ((opts.flags & GIT_MERGE_FAIL_ON_CONFLICT)) { giterr_set(GITERR_MERGE, "merge conflicts exist"); error = GIT_EMERGECONFLICT; goto done; @@ -1875,7 +1875,7 @@ int git_merge__iterators( } error = index_from_diff_list(out, diff_list, - (opts.tree_flags & GIT_MERGE_TREE_SKIP_REUC)); + (opts.flags & GIT_MERGE_SKIP_REUC)); done: if (!given_opts || !given_opts->metric) |