mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
Merge branch 'jc/abort-ll-merge-with-a-signal'
When the external merge driver is killed by a signal, its output should not be trusted as a resolution with conflicts that is proposed by the driver, but the code did. * jc/abort-ll-merge-with-a-signal: t6406: skip "external merge driver getting killed by a signal" test on Windows ll-merge: killing the external merge driver aborts the merge
This commit is contained in:
commit
3ea43bbe17
|
@ -1132,7 +1132,10 @@ size (see below).
|
|||
The merge driver is expected to leave the result of the merge in
|
||||
the file named with `%A` by overwriting it, and exit with zero
|
||||
status if it managed to merge them cleanly, or non-zero if there
|
||||
were conflicts.
|
||||
were conflicts. When the driver crashes (e.g. killed by SEGV),
|
||||
it is expected to exit with non-zero status that are higher than
|
||||
128, and in such a case, the merge results in a failure (which is
|
||||
different from producing a conflict).
|
||||
|
||||
The `merge.*.recursive` variable specifies what other merge
|
||||
driver to use when the merge driver is called for an internal
|
||||
|
|
|
@ -243,7 +243,14 @@ static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
|
|||
unlink_or_warn(temp[i]);
|
||||
strbuf_release(&cmd);
|
||||
strbuf_release(&path_sq);
|
||||
ret = (status > 0) ? LL_MERGE_CONFLICT : status;
|
||||
|
||||
if (!status)
|
||||
ret = LL_MERGE_OK;
|
||||
else if (status <= 128)
|
||||
ret = LL_MERGE_CONFLICT;
|
||||
else
|
||||
/* died due to a signal: WTERMSIG(status) + 128 */
|
||||
ret = LL_MERGE_ERROR;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -56,6 +56,12 @@ test_expect_success setup '
|
|||
) >"$ours+"
|
||||
cat "$ours+" >"$ours"
|
||||
rm -f "$ours+"
|
||||
|
||||
if test -f ./please-abort
|
||||
then
|
||||
echo >>./please-abort killing myself
|
||||
kill -9 $$
|
||||
fi
|
||||
exit "$exit"
|
||||
EOF
|
||||
chmod +x ./custom-merge
|
||||
|
@ -162,6 +168,23 @@ test_expect_success 'custom merge backend' '
|
|||
rm -f $o $a $b
|
||||
'
|
||||
|
||||
test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' '
|
||||
test_when_finished "rm -f output please-abort" &&
|
||||
|
||||
git reset --hard anchor &&
|
||||
git config --replace-all \
|
||||
merge.custom.driver "./custom-merge %O %A %B 0 %P" &&
|
||||
git config --replace-all \
|
||||
merge.custom.name "custom merge driver for testing" &&
|
||||
|
||||
>./please-abort &&
|
||||
echo "* merge=custom" >.gitattributes &&
|
||||
test_must_fail git merge main &&
|
||||
git ls-files -u >output &&
|
||||
git diff --name-only HEAD >>output &&
|
||||
test_must_be_empty output
|
||||
'
|
||||
|
||||
test_expect_success 'up-to-date merge without common ancestor' '
|
||||
git init repo1 &&
|
||||
git init repo2 &&
|
||||
|
|
Loading…
Reference in a new issue