| line |
true |
false |
branch |
|
37
|
0 |
0 |
assert(src); |
|
43
|
0 |
0 |
assert(src); |
|
49
|
0 |
0 |
assert(src); |
|
55
|
0 |
0 |
assert(src); |
|
61
|
0 |
0 |
assert(src); |
|
80
|
6 |
0 |
if (src->file_opts) |
|
83
|
2 |
4 |
if (driver->favor) |
|
86
|
0 |
6 |
if ((error = git_merge_file_from_index(&result, src->repo, |
|
90
|
4 |
2 |
if (!result.automergeable && |
|
|
4 |
0 |
if (!result.automergeable && |
|
96
|
2 |
0 |
*path_out = git_merge_file__best_path( |
|
|
2 |
0 |
*path_out = git_merge_file__best_path( |
|
|
2 |
0 |
*path_out = git_merge_file__best_path( |
|
101
|
2 |
0 |
*mode_out = git_merge_file__best_mode( |
|
|
2 |
0 |
*mode_out = git_merge_file__best_mode( |
|
|
2 |
0 |
*mode_out = git_merge_file__best_mode( |
|
184
|
0 |
258 |
GIT_ERROR_CHECK_ALLOC(entry); |
|
200
|
0 |
86 |
if ((error = git_vector_init(&merge_driver_registry.drivers, 3, |
|
204
|
86 |
0 |
if ((error = merge_driver_registry_insert( |
|
205
|
86 |
0 |
merge_driver_name__text, &git_merge_driver__text.base)) < 0 || |
|
207
|
86 |
0 |
merge_driver_name__union, &git_merge_driver__union.base)) < 0 || |
|
215
|
0 |
86 |
if (error < 0) |
|
229
|
0 |
0 |
git_vector_foreach(&merge_driver_registry.drivers, i, entry) { |
|
230
|
0 |
0 |
if (entry->driver->shutdown) |
|
255
|
0 |
0 |
if (!merge_driver_registry_find(pos, name)) |
|
265
|
0 |
0 |
assert(name && driver); |
|
|
0 |
0 |
assert(name && driver); |
|
272
|
0 |
0 |
if (!merge_driver_registry_find(NULL, name)) { |
|
297
|
0 |
0 |
if ((entry = merge_driver_registry_lookup(&pos, name)) == NULL) { |
|
306
|
0 |
0 |
if (entry->initialized && entry->driver->shutdown) { |
|
|
0 |
0 |
if (entry->initialized && entry->driver->shutdown) { |
|
329
|
4 |
0 |
if (name == merge_driver_name__text) |
|
331
|
0 |
0 |
else if (name == merge_driver_name__binary) |
|
343
|
0 |
0 |
if (entry == NULL) { |
|
348
|
0 |
0 |
if (!entry->initialized) { |
|
349
|
0 |
0 |
if (entry->driver->initialize && |
|
|
0 |
0 |
if (entry->driver->initialize && |
|
370
|
0 |
4 |
if ((error = git_attr_get(&value, repo, 0, path, "merge")) < 0) |
|
374
|
0 |
4 |
if (GIT_ATTR_IS_TRUE(value)) |
|
378
|
0 |
4 |
else if (GIT_ATTR_IS_FALSE(value)) |
|
381
|
4 |
0 |
else if (GIT_ATTR_IS_UNSPECIFIED(value) && default_driver) |
|
|
0 |
4 |
else if (GIT_ATTR_IS_UNSPECIFIED(value) && default_driver) |
|
384
|
4 |
0 |
else if (GIT_ATTR_IS_UNSPECIFIED(value)) |
|
399
|
0 |
4 |
if (driver == NULL) |
|
413
|
4 |
0 |
path = git_merge_file__best_path( |
|
|
4 |
0 |
path = git_merge_file__best_path( |
|
|
4 |
0 |
path = git_merge_file__best_path( |
|
418
|
0 |
4 |
if ((error = merge_driver_name_for_path( |