diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 03:36:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-15 23:28:10 -0700 |
| commit | fadf488f9b8c4fc709f0b083d2769ecc1e0e1119 (patch) | |
| tree | 9af600ad8903ae3f6aa32cabf713b8945f5f4ff5 /t | |
| parent | 634cd48a8afdd920fa26c8ec3ae43e96c82c81f2 (diff) | |
| download | git-fadf488f9b8c4fc709f0b083d2769ecc1e0e1119.tar.gz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6024-recursive-merge.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index a398556137..058db9cc52 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 |