diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 03:37:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-04 23:10:29 -0700 |
| commit | 5771907a5745799c559ff21ccfcabfd21cc23b36 (patch) | |
| tree | 47427699ad65ca3a9bd1b5192e53490fc5166623 /builtin-merge-file.c | |
| parent | 9f30855d0ff5206e85e45f0307be9d18ffda41d3 (diff) | |
| download | git-5771907a5745799c559ff21ccfcabfd21cc23b36.tar.gz git-5771907a5745799c559ff21ccfcabfd21cc23b36.tar.xz | |
git-merge-file: refuse to merge binary files
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
| -rw-r--r-- | builtin-merge-file.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 913577390..10ec63b17 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); |