@matheusbsbs / matheus-bagliano / commits / 9f30855d0f
Fork 0

merge-recursive: refuse to merge binary files

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jun 5, 2007 at 03:36 UTC 9f30855d0ff5206e85e45f0307be9d18ffda41d3
2 files changed +20
merge-recursive.c
+6
@@ -680,6 +680,12 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
680 {
681 xpparam_t xpp;
682
683 + if (buffer_is_binary(orig->ptr, orig->size) ||
684 + buffer_is_binary(src1->ptr, src1->size) ||
685 + buffer_is_binary(src2->ptr, src2->size))
686 + return error("Cannot merge binary files: %s vs. %s\n",
687 + name1, name2);
688 +
689 memset(&xpp, 0, sizeof(xpp));
690 return xdl_merge(orig,
691 src1, name1,
t/t6024-recursive-merge.sh
+14
@@ -81,4 +81,18 @@ EOF
81
82 test_expect_success "virtual trees were processed" "git diff expect out"
83
84 +git reset --hard
85 +test_expect_success 'refuse to merge binary files' '
86 + printf "\0" > binary-file &&
87 + git add binary-file &&
88 + git commit -m binary &&
89 + git checkout G &&
90 + printf "\0\0" > binary-file &&
91 + git add binary-file &&
92 + git commit -m binary2 &&
93 + ! git merge F > merge.out 2> merge.err &&
94 + grep "Cannot merge binary files: HEAD:binary-file vs. F:binary-file" \
95 + merge.err
96 +'
97 +
98 test_done