diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 02:36:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 06:28:10 (GMT) |
| commit | fadf488f9b8c4fc709f0b083d2769ecc1e0e1119 (patch) | |
| tree | 9af600ad8903ae3f6aa32cabf713b8945f5f4ff5 | |
| parent | 634cd48a8afdd920fa26c8ec3ae43e96c82c81f2 (diff) | |
| download | git-fadf488f9b8c4fc709f0b083d2769ecc1e0e1119.zip git-fadf488f9b8c4fc709f0b083d2769ecc1e0e1119.tar.gz git-fadf488f9b8c4fc709f0b083d2769ecc1e0e1119.tar.bz2 | |
merge-recursive: refuse to merge binary files
[jc: cherry-picked 9f30855 from 'master']
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-recursive.c | 6 | ||||
| -rwxr-xr-x | t/t6024-recursive-merge.sh | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8f72b2c..4a82b74 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -680,6 +680,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 |