Andrew's git / gitweb.git /
9692f16f3581f261c4c10a29f03751990adb7897
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='git apply handling binary patches
   7
   8'
   9. ./test-lib.sh
  10
  11# setup
  12
  13cat >file1 <<EOF
  14A quick brown fox jumps over the lazy dog.
  15A tiny little penguin runs around in circles.
  16There is a flag with Linux written on it.
  17A slow black-and-white panda just sits there,
  18munching on his bamboo.
  19EOF
  20cat file1 >file2
  21cat file1 >file4
  22
  23test_expect_success 'setup' "
  24        git update-index --add --remove file1 file2 file4 &&
  25        git commit -m 'Initial Version' 2>/dev/null &&
  26
  27        git checkout -b binary &&
  28        perl -pe 'y/x/\000/' <file1 >file3 &&
  29        cat file3 >file4 &&
  30        git add file2 &&
  31        perl -pe 'y/\000/v/' <file3 >file1 &&
  32        rm -f file2 &&
  33        git update-index --add --remove file1 file2 file3 file4 &&
  34        git commit -m 'Second Version' &&
  35
  36        git diff-tree -p master binary >B.diff &&
  37        git diff-tree -p -C master binary >C.diff &&
  38
  39        git diff-tree -p --binary master binary >BF.diff &&
  40        git diff-tree -p --binary -C master binary >CF.diff
  41"
  42
  43test_expect_success 'stat binary diff -- should not fail.' \
  44        'git checkout master
  45         git apply --stat --summary B.diff'
  46
  47test_expect_success 'stat binary diff (copy) -- should not fail.' \
  48        'git checkout master
  49         git apply --stat --summary C.diff'
  50
  51test_expect_success 'check binary diff -- should fail.' \
  52        'git checkout master &&
  53         test_must_fail git apply --check B.diff'
  54
  55test_expect_success 'check binary diff (copy) -- should fail.' \
  56        'git checkout master &&
  57         test_must_fail git apply --check C.diff'
  58
  59test_expect_success \
  60        'check incomplete binary diff with replacement -- should fail.' '
  61        git checkout master &&
  62        test_must_fail git apply --check --allow-binary-replacement B.diff
  63'
  64
  65test_expect_success \
  66    'check incomplete binary diff with replacement (copy) -- should fail.' '
  67         git checkout master &&
  68         test_must_fail git apply --check --allow-binary-replacement C.diff
  69'
  70
  71test_expect_success 'check binary diff with replacement.' \
  72        'git checkout master
  73         git apply --check --allow-binary-replacement BF.diff'
  74
  75test_expect_success 'check binary diff with replacement (copy).' \
  76        'git checkout master
  77         git apply --check --allow-binary-replacement CF.diff'
  78
  79# Now we start applying them.
  80
  81do_reset () {
  82        rm -f file? &&
  83        git reset --hard &&
  84        git checkout -f master
  85}
  86
  87test_expect_success 'apply binary diff -- should fail.' \
  88        'do_reset &&
  89         test_must_fail git apply B.diff'
  90
  91test_expect_success 'apply binary diff -- should fail.' \
  92        'do_reset &&
  93         test_must_fail git apply --index B.diff'
  94
  95test_expect_success 'apply binary diff (copy) -- should fail.' \
  96        'do_reset &&
  97         test_must_fail git apply C.diff'
  98
  99test_expect_success 'apply binary diff (copy) -- should fail.' \
 100        'do_reset &&
 101         test_must_fail git apply --index C.diff'
 102
 103test_expect_success 'apply binary diff without replacement.' \
 104        'do_reset &&
 105         git apply BF.diff'
 106
 107test_expect_success 'apply binary diff without replacement (copy).' \
 108        'do_reset &&
 109         git apply CF.diff'
 110
 111test_expect_success 'apply binary diff.' \
 112        'do_reset &&
 113         git apply --allow-binary-replacement --index BF.diff &&
 114         test -z "$(git diff --name-status binary)"'
 115
 116test_expect_success 'apply binary diff (copy).' \
 117        'do_reset &&
 118         git apply --allow-binary-replacement --index CF.diff &&
 119         test -z "$(git diff --name-status binary)"'
 120
 121test_done