{"thread":{"id":"8432","subject":"[PATCH 2/3] merge-recursive: refuse to merge binary files","startedAt":"2007-06-05T02:36:49Z","lastAt":"2007-06-05T02:36:49Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"44023","messageId":"Pine.LNX.4.64.0706050336270.4046@racer.site","threadId":"8432","inReplyTo":null,"subject":"[PATCH 2/3] merge-recursive: refuse to merge binary files","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-06-05T02:36:49Z","receivedAt":"2007-06-05T02:36:49Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n merge-recursive.c          |    6 ++++++\n t/t6024-recursive-merge.sh |   14 ++++++++++++++\n 2 files changed, 20 insertions(+), 0 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 4d70fd4..02c7983 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -658,6 +658,12 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,\n {\n \txpparam_t xpp;\n \n+\tif (buffer_is_binary(orig->ptr, orig->size) ||\n+\t\t\tbuffer_is_binary(src1->ptr, src1->size) ||\n+\t\t\tbuffer_is_binary(src2->ptr, src2->size))\n+\t\treturn error(\"Cannot merge binary files: %s vs. %s\\n\",\n+\t\t\tname1, name2);\n+\n \tmemset(&xpp, 0, sizeof(xpp));\n \treturn xdl_merge(orig,\n \t\t\t src1, name1,\ndiff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh\nindex a398556..058db9c 100755\n--- a/t/t6024-recursive-merge.sh\n+++ b/t/t6024-recursive-merge.sh\n@@ -81,4 +81,18 @@ EOF\n \n test_expect_success \"virtual trees were processed\" \"git diff expect out\"\n \n+git reset --hard\n+test_expect_success 'refuse to merge binary files' '\n+\tprintf \"\\0\" > binary-file &&\n+\tgit add binary-file &&\n+\tgit commit -m binary &&\n+\tgit checkout G &&\n+\tprintf \"\\0\\0\" > binary-file &&\n+\tgit add binary-file &&\n+\tgit commit -m binary2 &&\n+\t! git merge F > merge.out 2> merge.err &&\n+\tgrep \"Cannot merge binary files: HEAD:binary-file vs. F:binary-file\" \\\n+\t\tmerge.err\n+'\n+\n test_done\n-- \n1.5.2.1.2626.ge1044-dirty\n"}]}