Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge_file.c - allow ours or theirs to be NULL in git_merge_file_from_index

Browse Source 
Improve git_merge_file_from_index by adding suport to missing children.
This commit is contained in:
Edmundo Carmona Antoranz
2025-06-13 20:28:34 +02:00
parent 5ab90d3c27
commit 16c23e7d2e
1 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/libgit2/merge_file.c
View File

@@ -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;
@@ -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;
@@ -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;
@@ -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)
@@ -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));
@@ -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]);