| line |
true |
false |
branch |
|
39
|
0 |
33 |
GIT_ASSERT_ARG(input_out); |
|
40
|
0 |
33 |
GIT_ASSERT_ARG(odb_object_out); |
|
41
|
0 |
33 |
GIT_ASSERT_ARG(odb); |
|
42
|
0 |
33 |
GIT_ASSERT_ARG(entry); |
|
44
|
0 |
33 |
if ((error = git_odb_read(odb_object_out, odb, &entry->id)) < 0) |
|
60
|
11 |
0 |
if (given_opts) |
|
89
|
11 |
0 |
if (ours->size > LONG_MAX || |
|
|
11 |
0 |
if (ours->size > LONG_MAX || |
|
90
|
11 |
0 |
theirs->size > LONG_MAX || |
|
91
|
0 |
11 |
(ancestor && ancestor->size > LONG_MAX)) { |
|
97
|
11 |
0 |
if (ancestor) { |
|
99
|
4 |
7 |
options.ancestor_label : ancestor->path; |
|
105
|
4 |
7 |
options.our_label : ours->path; |
|
110
|
4 |
7 |
options.their_label : theirs->path; |
|
114
|
2 |
9 |
if (options.favor == GIT_MERGE_FILE_FAVOR_OURS) |
|
116
|
1 |
8 |
else if (options.favor == GIT_MERGE_FILE_FAVOR_THEIRS) |
|
118
|
0 |
8 |
else if (options.favor == GIT_MERGE_FILE_FAVOR_UNION) |
|
122
|
0 |
11 |
XDL_MERGE_ZEALOUS_ALNUM : XDL_MERGE_ZEALOUS; |
|
124
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_STYLE_DIFF3) |
|
126
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_STYLE_ZDIFF3) |
|
129
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE) |
|
131
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE) |
|
133
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL) |
|
136
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_DIFF_PATIENCE) |
|
139
|
0 |
11 |
if (options.flags & GIT_MERGE_FILE_DIFF_MINIMAL) |
|
144
|
0 |
11 |
if ((xdl_result = xdl_merge(&ancestor_mmfile, &our_mmfile, |
|
151
|
11 |
0 |
path = git_merge_file__best_path( |
|
156
|
11 |
0 |
if (path != NULL && (out->path = git__strdup(path)) == NULL) { |
|
|
0 |
11 |
if (path != NULL && (out->path = git__strdup(path)) == NULL) { |
|
164
|
11 |
0 |
out->mode = git_merge_file__best_mode( |
|
170
|
0 |
11 |
if (error < 0) |
|
178
|
33 |
0 |
size_t len = file ? file->size : 0; |
|
180
|
0 |
33 |
if (len > GIT_XDIFF_MAX_SIZE) |
|
182
|
0 |
33 |
if (len > GIT_MERGE_FILE_BINARY_SIZE) |
|
185
|
33 |
0 |
return len ? (memchr(file->ptr, 0, len) != NULL) : false; |
|
|
0 |
33 |
return len ? (memchr(file->ptr, 0, len) != NULL) : false; |
|
198
|
0 |
0 |
if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) |
|
|
0 |
0 |
if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) |
|
200
|
0 |
0 |
else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) |
|
|
0 |
0 |
else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) |
|
226
|
0 |
11 |
merge_file__is_binary(ours) || |
|
239
|
0 |
0 |
if (!out->path) |
|
242
|
0 |
0 |
if (!out->mode) |
|
257
|
0 |
0 |
GIT_ASSERT_ARG(out); |
|
258
|
0 |
0 |
GIT_ASSERT_ARG(ours); |
|
259
|
0 |
0 |
GIT_ASSERT_ARG(theirs); |
|
263
|
0 |
0 |
if (ancestor) |
|
286
|
0 |
11 |
GIT_ASSERT_ARG(out); |
|
287
|
0 |
11 |
GIT_ASSERT_ARG(repo); |
|
288
|
0 |
11 |
GIT_ASSERT_ARG(ours); |
|
289
|
0 |
11 |
GIT_ASSERT_ARG(theirs); |
|
293
|
0 |
11 |
if ((error = git_repository_odb(&odb, repo)) < 0) |
|
296
|
11 |
0 |
if (ancestor) { |
|
297
|
0 |
11 |
if ((error = merge_file_input_from_index( |
|
304
|
11 |
0 |
if ((error = merge_file_input_from_index(&our_input, &odb_object[1], odb, ours)) < 0 || |
|
|
11 |
0 |
if ((error = merge_file_input_from_index(&our_input, &odb_object[1], odb, ours)) < 0 || |
|
322
|
0 |
17 |
if (result == NULL) |