Andrew's git - gitweb.git/blob - t/t4103-apply-binary.sh

   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
  23git update-index --add --remove file1 file2 file4
  24git-commit -m 'Initial Version' 2>/dev/null
  25
  26git-checkout -b binary
  27tr 'x' '\0' <file1 >file3
  28cat file3 >file4
  29git add file2
  30tr '\0' 'v' <file3 >file1
  31rm -f file2
  32git update-index --add --remove file1 file2 file3 file4
  33git-commit -m 'Second Version'
  34
  35git diff-tree -p master binary >B.diff
  36git diff-tree -p -C master binary >C.diff
  37
  38git diff-tree -p --binary master binary >BF.diff
  39git diff-tree -p --binary -C master binary >CF.diff
  40
  41test_expect_success 'stat binary diff -- should not fail.' \
  42        'git-checkout master
  43         git apply --stat --summary B.diff'
  44
  45test_expect_success 'stat binary diff (copy) -- should not fail.' \
  46        'git-checkout master
  47         git apply --stat --summary C.diff'
  48
  49test_expect_failure 'check binary diff -- should fail.' \
  50        'git-checkout master
  51         git apply --check B.diff'
  52
  53test_expect_failure 'check binary diff (copy) -- should fail.' \
  54        'git-checkout master
  55         git apply --check C.diff'
  56
  57test_expect_failure 'check incomplete binary diff with replacement -- should fail.' \
  58        'git-checkout master
  59         git apply --check --allow-binary-replacement B.diff'
  60
  61test_expect_failure 'check incomplete binary diff with replacement (copy) -- should fail.' \
  62        'git-checkout master
  63         git apply --check --allow-binary-replacement C.diff'
  64
  65test_expect_success 'check binary diff with replacement.' \
  66        'git-checkout master
  67         git apply --check --allow-binary-replacement BF.diff'
  68
  69test_expect_success 'check binary diff with replacement (copy).' \
  70        'git-checkout master
  71         git apply --check --allow-binary-replacement CF.diff'
  72
  73# Now we start applying them.
  74
  75do_reset () {
  76        rm -f file?
  77        git-reset --hard
  78        git-checkout -f master
  79}
  80
  81test_expect_failure 'apply binary diff -- should fail.' \
  82        'do_reset
  83         git apply B.diff'
  84
  85test_expect_failure 'apply binary diff -- should fail.' \
  86        'do_reset
  87         git apply --index B.diff'
  88
  89test_expect_failure 'apply binary diff (copy) -- should fail.' \
  90        'do_reset
  91         git apply C.diff'
  92
  93test_expect_failure 'apply binary diff (copy) -- should fail.' \
  94        'do_reset
  95         git apply --index C.diff'
  96
  97test_expect_success 'apply binary diff without replacement.' \
  98        'do_reset
  99         git apply BF.diff'
 100
 101test_expect_success 'apply binary diff without replacement (copy).' \
 102        'do_reset
 103         git apply CF.diff'
 104
 105test_expect_success 'apply binary diff.' \
 106        'do_reset
 107         git apply --allow-binary-replacement --index BF.diff &&
 108         test -z "$(git diff --name-status binary)"'
 109
 110test_expect_success 'apply binary diff (copy).' \
 111        'do_reset
 112         git apply --allow-binary-replacement --index CF.diff &&
 113         test -z "$(git diff --name-status binary)"'
 114
 115test_done