diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-06-09 02:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-09 02:06:01 -0700 |
| commit | 89dd19e107455ee680b4d0e027998f0608840fe8 (patch) | |
| tree | 16aaba6aab254516118ece37054fca38ad5d1dee | |
| parent | cmd_log_init: remove parsing of --encoding command line parameter (diff) | |
| parent | git-merge-file: refuse to merge binary files (diff) | |
| download | tgif-89dd19e107455ee680b4d0e027998f0608840fe8.tar.xz | |
Merge branch 'js/merge'
* js/merge:
git-merge-file: refuse to merge binary files
| -rw-r--r-- | builtin-merge-file.c | 6 | ||||
| -rwxr-xr-x | t/t6023-merge-file.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 9135773908..10ec63b17e 100644 --- a/builtin-merge-file.c +++ b/builtin-merge-file.c @@ -36,9 +36,13 @@ int cmd_merge_file(int argc, char **argv, char **envp) for (; i < 3; i++) names[i] = argv[i + 1]; - for (i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { if (read_mmfile(mmfs + i, argv[i + 1])) return -1; + if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size)) + return error("Cannot merge binary files: %s\n", + argv[i + 1]); + } ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2], &xpp, XDL_MERGE_ZEALOUS, &result); diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 43aa5d033d..ecc11c1a84 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -134,4 +134,9 @@ EOF test_expect_success "expected conflict markers" "git diff expect out" +test_expect_success 'binary files cannot be merged' ' + ! git merge-file -p orig.txt ../test4012.png new1.txt 2> merge.err && + grep "Cannot merge binary files" merge.err +' + test_done |