Johannes SchindelinSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- merge-recursive.c | 6 ++++++ t/t6024-recursive-merge.sh | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
Show changes to 2 files +20 −0
merge-recursive.c, t/t6024-recursive-merge.sh
diff --git a/merge-recursive.c b/merge-recursive.c index 4d70fd4..02c7983 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -658,6 +658,12 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, { xpparam_t xpp; + if (buffer_is_binary(orig->ptr, orig->size) || + buffer_is_binary(src1->ptr, src1->size) || + buffer_is_binary(src2->ptr, src2->size)) + return error("Cannot merge binary files: %s vs. %s\n", + name1, name2); + memset(&xpp, 0, sizeof(xpp)); return xdl_merge(orig, src1, name1, diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index a398556..058db9c 100755 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -81,4 +81,18 @@ EOF test_expect_success "virtual trees were processed" "git diff expect out" +git reset --hard +test_expect_success 'refuse to merge binary files' ' + printf "\0" > binary-file && + git add binary-file && + git commit -m binary && + git checkout G && + printf "\0\0" > binary-file && + git add binary-file && + git commit -m binary2 && + ! git merge F > merge.out 2> merge.err && + grep "Cannot merge binary files: HEAD:binary-file vs. F:binary-file" \ + merge.err +' + test_done
-- 1.5.2.1.2626.ge1044-dirty