diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-07 15:19:43 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 11:02:27 -0400 |
| commit | 4662583692e92ea1b0eb06e37ffe9d363740db30 (patch) | |
| tree | 50e60bd6c5a6385468b5d01eca327b1f3deeac7f /src/merge.c | |
| parent | 58d33126d44eeff69e375e500d1e77e03e2665a0 (diff) | |
| download | libgit2-4662583692e92ea1b0eb06e37ffe9d363740db30.tar.gz | |
merge driver: correct indentation
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/merge.c b/src/merge.c index 9a6442a91..5ef0f3609 100644 --- a/src/merge.c +++ b/src/merge.c @@ -261,7 +261,7 @@ int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const int git_merge_bases(git_oidarray *out, git_repository *repo, const git_oid *one, const git_oid *two) { int error; - git_revwalk *walk; + git_revwalk *walk; git_commit_list *result, *list; git_array_oid_t array; @@ -925,8 +925,8 @@ static int merge_conflict_resolve_contents( goto done; } - error = merge_conflict_invoke_driver(&merge_result, - driver, data, diff_list, &source); + error = merge_conflict_invoke_driver(&merge_result, + driver, data, diff_list, &source); if (error == GIT_PASSTHROUGH) { data = NULL; @@ -934,12 +934,12 @@ static int merge_conflict_resolve_contents( &git_merge_driver__text, data, diff_list, &source); } - if (error < 0) { - if (error == GIT_EMERGECONFLICT) - error = 0; + if (error < 0) { + if (error == GIT_EMERGECONFLICT) + error = 0; - goto done; - } + goto done; + } git_vector_insert(&diff_list->staged, merge_result); git_vector_insert(&diff_list->resolved, (git_merge_diff *)conflict); @@ -2199,14 +2199,14 @@ static int merge_annotated_commits( git_iterator *base_iter = NULL, *our_iter = NULL, *their_iter = NULL; int error; - if ((error = compute_base(&base, repo, ours, theirs, opts, + if ((error = compute_base(&base, repo, ours, theirs, opts, recursion_level)) < 0) { - if (error != GIT_ENOTFOUND) - goto done; + if (error != GIT_ENOTFOUND) + goto done; - giterr_clear(); - } + giterr_clear(); + } if ((error = iterator_for_annotated_commit(&base_iter, base)) < 0 || (error = iterator_for_annotated_commit(&our_iter, ours)) < 0 || |