proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-05 14:37:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge_file: do not unnecessarily check ours/theirs for NULL

Browse Source 
The `merge_file__xdiff` function checks if either `ours` or
`theirs` is `NULL`. The function is to be called with existing
files, though, and in fact already unconditionally dereferences
both pointers.

Remove the unnecessary check to silence warnings.
This commit is contained in:
Patrick Steinhardt 2016-05-02 14:46:14 +02:00
parent f80852af80
commit fcd1b78601
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/merge_file.c
View File

@ -134,8 +134,8 @@ static int merge_file__xdiff(
path = git_merge_file__best_path(
ancestor ? ancestor->path : NULL,
ours ? ours->path : NULL,
theirs ? theirs->path : NULL);
ours->path,
theirs->path);
if (path != NULL && (out->path = git__strdup(path)) == NULL) {
error = -1;
@ -147,8 +147,8 @@ static int merge_file__xdiff(
out->len = mmbuffer.size;
out->mode = git_merge_file__best_mode(
ancestor ? ancestor->mode : 0,
ours ? ours->mode : 0,
theirs ? theirs->mode : 0);
ours->mode,
theirs->mode);
done:
if (error < 0)