diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 2cbf531f9..115867971 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1649,7 +1649,7 @@ static int write_merge_head( goto cleanup; for (i = 0; i < heads_len; i++) { - if ((error = git_filebuf_printf(&file, "%s\n", &heads[i]->oid_str)) < 0) + if ((error = git_filebuf_printf(&file, "%s\n", heads[i]->oid_str)) < 0) goto cleanup; } @@ -2240,6 +2240,8 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde git_diff_options opts = GIT_DIFF_OPTIONS_INIT; int error = 0; + GIT_UNUSED(index_new); + *conflicts = 0; opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; |