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

merge drivers: handle configured but not found driver

Browse Source
This commit is contained in:
Edward Thomson 2016-02-28 21:30:00 -05:00
parent 6d8b2cdbee
commit d953c4505e
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/merge.c
View File

@ -891,7 +891,8 @@ static int merge_conflict_resolve_contents(
git_index_entry *merge_result; git_index_entry *merge_result;
git_odb *odb = NULL; git_odb *odb = NULL;
const char *name; const char *name;
int error = 0; bool fallback = false;
int error;
assert(resolved && diff_list && conflict); assert(resolved && diff_list && conflict);
@ -924,12 +925,20 @@ static int merge_conflict_resolve_contents(
/* find the merge driver for this file */ /* find the merge driver for this file */
if ((error = git_merge_driver_for_source(&name, &driver, &source)) < 0) if ((error = git_merge_driver_for_source(&name, &driver, &source)) < 0)
goto done; goto done;
if (driver == NULL)
fallback = true;
} }
error = merge_conflict_invoke_driver(&merge_result, name, driver, if (driver) {
diff_list, &source); error = merge_conflict_invoke_driver(&merge_result, name, driver,
diff_list, &source);
if (error == GIT_PASSTHROUGH) { if (error == GIT_PASSTHROUGH)
fallback = true;
}
if (fallback) {
error = merge_conflict_invoke_driver(&merge_result, "text", error = merge_conflict_invoke_driver(&merge_result, "text",
&git_merge_driver__text.base, diff_list, &source); &git_merge_driver__text.base, diff_list, &source);
} }

18
tests/merge/driver.c
View File

@ -368,3 +368,21 @@ void test_merge_driver__unset_forces_binary(void)
cl_git_pass(git_index_conflict_get(&ancestor, &ours, &theirs, cl_git_pass(git_index_conflict_get(&ancestor, &ours, &theirs,
repo_index, "automergeable.txt")); repo_index, "automergeable.txt"));
} }
void test_merge_driver__not_configured_driver_falls_back(void)
{
const git_index_entry *idx;
test_drivers_unregister();
/* `merge` without specifying a driver indicates `text` */
set_gitattributes_to("notfound");
merge_branch();
cl_assert((idx = git_index_get_bypath(repo_index, "automergeable.txt", 0)));
cl_assert_equal_oid(&automergeable_id, &idx->id);
test_drivers_register();
}