Thanks to visit codestin.com
Credit goes to github.com

Skip to content

git_merge_file_from_index: handle cases when a child (ours or theirs) is null #7092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

git_merge_file_from_index: handle cases when a child (ours or theirs) is null #7092

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16c23e7
merge_file.c - allow ours or theirs to be NULL in git_merge_file_from…
eantoranz Jun 13, 2025
ba62ad3
merge.h - improve handling when there is no ancestor in merge_file__b…
eantoranz Jun 13, 2025
0370375
git_merge_file_from_index: add unit test for deleted/added file
eantoranz Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
merge_file.c - allow ours or theirs to be NULL in git_merge_file_from… 
…_index

Improve git_merge_file_from_index by adding suport to missing children.
  • Loading branch information
@eantoranz
eantoranz committed Jun 14, 2025
commit 16c23e7d2e11cfadbcf4d8c007d7fefcef5fdd7f
62 changes: 40 additions & 22 deletions src/libgit2/merge_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ static int merge_file__xdiff(

memset(&xmparam, 0x0, sizeof(xmparam_t));

if (ours->size > LONG_MAX ||
theirs->size > LONG_MAX ||
if ((ours && ours->size > LONG_MAX) ||
(theirs && theirs->size > LONG_MAX) ||
(ancestor && ancestor->size > LONG_MAX)) {
git_error_set(GIT_ERROR_MERGE, "failed to merge files");
error = -1;
Expand All @@ -99,15 +99,19 @@ static int merge_file__xdiff(
ancestor_mmfile.size = (long)ancestor->size;
}

xmparam.file1 = (options.our_label) ?
options.our_label : ours->path;
our_mmfile.ptr = (char *)ours->ptr;
our_mmfile.size = (long)ours->size;
if (ours) {
xmparam.file1 = (options.our_label) ?
options.our_label : ours->path;
our_mmfile.ptr = (char *)ours->ptr;
our_mmfile.size = (long)ours->size;
}

xmparam.file2 = (options.their_label) ?
options.their_label : theirs->path;
their_mmfile.ptr = (char *)theirs->ptr;
their_mmfile.size = (long)theirs->size;
if (theirs) {
xmparam.file2 = (options.their_label) ?
options.their_label : theirs->path;
their_mmfile.ptr = (char *)theirs->ptr;
their_mmfile.size = (long)theirs->size;
}

if (options.favor == GIT_MERGE_FILE_FAVOR_OURS)
xmparam.favor = XDL_MERGE_FAVOR_OURS;
Expand Down Expand Up @@ -148,8 +152,8 @@ static int merge_file__xdiff(

path = git_merge_file__best_path(
ancestor ? ancestor->path : NULL,
ours->path,
theirs->path);
ours ? ours->path : NULL,
theirs ? theirs->path : NULL);

if (path != NULL && (out->path = git__strdup(path)) == NULL) {
error = -1;
Expand All @@ -161,8 +165,8 @@ static int merge_file__xdiff(
out->len = mmbuffer.size;
out->mode = git_merge_file__best_mode(
ancestor ? ancestor->mode : 0,
ours->mode,
theirs->mode);
ours ? ours->mode : 0,
theirs ? theirs->mode : 0);

done:
if (error < 0)
Expand Down Expand Up @@ -276,15 +280,17 @@ int git_merge_file_from_index(
const git_merge_file_options *options)
{
git_merge_file_input *ancestor_ptr = NULL,
ancestor_input = {0}, our_input = {0}, their_input = {0};
git_odb *odb = NULL;
ancestor_input = {0};
git_merge_file_input *our_ptr = NULL,
our_input = {0};
git_merge_file_input *their_ptr = NULL,
their_input = {0};
git_odb *odb;
git_odb_object *odb_object[3] = { 0 };
int error = 0;

GIT_ASSERT_ARG(out);
GIT_ASSERT_ARG(repo);
GIT_ASSERT_ARG(ours);
GIT_ASSERT_ARG(theirs);

memset(out, 0x0, sizeof(git_merge_file_result));

Expand All @@ -299,12 +305,24 @@ int git_merge_file_from_index(
ancestor_ptr = &ancestor_input;
}

if ((error = merge_file_input_from_index(&our_input, &odb_object[1], odb, ours)) < 0 ||
(error = merge_file_input_from_index(&their_input, &odb_object[2], odb, theirs)) < 0)
goto done;
if (ours) {
if ((error = merge_file_input_from_index(
&our_input, &odb_object[1], odb, ours)) < 0)
goto done;

our_ptr = &our_input;
}

if (theirs) {
if ((error = merge_file_input_from_index(
&their_input, &odb_object[2], odb, theirs)) < 0)
goto done;

their_ptr = &their_input;
}

error = merge_file__from_inputs(out,
ancestor_ptr, &our_input, &their_input, options);
ancestor_ptr, our_ptr, their_ptr, options);

done:
git_odb_object_free(odb_object[0]);
Expand Down