Andrew's git / gitweb.git /
daf82346141120194c448edbc9571a8e1da99b52
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Junio C Hamano
   4#
   5
   6test_description='Binary diff and apply
   7'
   8
   9. ./test-lib.sh
  10
  11cat >expect.binary-numstat <<\EOF
  121       1       a
  13-       -       b
  141       1       c
  15-       -       d
  16EOF
  17
  18test_expect_success 'prepare repository' '
  19         echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
  20         git update-index --add a b c d &&
  21         echo git >a &&
  22         cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
  23         echo git >c &&
  24         cat b b >d
  25'
  26
  27cat > expected <<\EOF
  28 a |    2 +-
  29 b |  Bin
  30 c |    2 +-
  31 d |  Bin
  32 4 files changed, 2 insertions(+), 2 deletions(-)
  33EOF
  34test_expect_success 'apply --stat output for binary file change' '
  35        git diff >diff &&
  36        git apply --stat --summary <diff >current &&
  37        test_i18ncmp expected current
  38'
  39
  40test_expect_success 'diff --shortstat output for binary file change' '
  41        echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected &&
  42        git diff --shortstat >current &&
  43        test_i18ncmp expected current
  44'
  45
  46test_expect_success 'diff --shortstat output for binary file change only' '
  47        echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
  48        git diff --shortstat -- b >current &&
  49        test_i18ncmp expected current
  50'
  51
  52test_expect_success 'apply --numstat notices binary file change' '
  53        git diff >diff &&
  54        git apply --numstat <diff >current &&
  55        test_cmp expect.binary-numstat current
  56'
  57
  58test_expect_success 'apply --numstat understands diff --binary format' '
  59        git diff --binary >diff &&
  60        git apply --numstat <diff >current &&
  61        test_cmp expect.binary-numstat current
  62'
  63
  64# apply needs to be able to skip the binary material correctly
  65# in order to report the line number of a corrupt patch.
  66test_expect_success 'apply detecting corrupt patch correctly' '
  67         git diff >output &&
  68         sed -e "s/-CIT/xCIT/" <output >broken &&
  69         if git apply --stat --summary broken 2>detected
  70         then
  71                echo unhappy - should have detected an error
  72                (exit 1)
  73         else
  74                echo happy
  75         fi &&
  76         detected=`cat detected` &&
  77         detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
  78         detected=`sed -ne "${detected}p" broken` &&
  79         test "$detected" = xCIT
  80'
  81
  82test_expect_success 'apply detecting corrupt patch correctly' '
  83         git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
  84         if git apply --stat --summary broken 2>detected
  85         then
  86                echo unhappy - should have detected an error
  87                (exit 1)
  88         else
  89                echo happy
  90         fi &&
  91         detected=`cat detected` &&
  92         detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
  93         detected=`sed -ne "${detected}p" broken` &&
  94         test "$detected" = xCIT
  95'
  96
  97test_expect_success 'initial commit' 'git commit -a -m initial'
  98
  99# Try removal (b), modification (d), and creation (e).
 100test_expect_success 'diff-index with --binary' '
 101         echo AIT >a && mv b e && echo CIT >c && cat e >d &&
 102         git update-index --add --remove a b c d e &&
 103         tree0=`git write-tree` &&
 104         git diff --cached --binary >current &&
 105         git apply --stat --summary current
 106'
 107
 108test_expect_success 'apply binary patch' '
 109         git reset --hard &&
 110         git apply --binary --index <current &&
 111         tree1=`git write-tree` &&
 112         test "$tree1" = "$tree0"
 113'
 114
 115test_expect_success 'diff --no-index with binary creation' '
 116        echo Q | q_to_nul >binary &&
 117        (: hide error code from diff, which just indicates differences
 118         git diff --binary --no-index /dev/null binary >current ||
 119         true
 120        ) &&
 121        rm binary &&
 122        git apply --binary <current &&
 123        echo Q >expected &&
 124        nul_to_q <binary >actual &&
 125        test_cmp expected actual
 126'
 127
 128cat >expect <<EOF
 129 binfile  |   Bin 0 -> 1026 bytes
 130 textfile | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 131EOF
 132
 133test_expect_success 'diff --stat with binary files and big change count' '
 134        echo X | dd of=binfile bs=1k seek=1 &&
 135        git add binfile &&
 136        i=0 &&
 137        while test $i -lt 10000; do
 138                echo $i &&
 139                i=$(($i + 1))
 140        done >textfile &&
 141        git add textfile &&
 142        git diff --cached --stat binfile textfile >output &&
 143        grep " | " output >actual &&
 144        test_cmp expect actual
 145'
 146
 147test_done