t/t4008-diff-break-rewrite.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Junio C Hamano
   4 #
   5
   6 test_description='Break and then rename
   7
   8 We have two very different files, file0 and file1, registered in a tree.
   9
  10 We update file1 so drastically that it is more similar to file0, and
  11 then remove file0.  With -B, changes to file1 should be broken into
  12 separate delete and create, resulting in removal of file0, removal of
  13 original file1 and creation of completely rewritten file1.
  14
  15 Further, with -B and -M together, these three modifications should
  16 turn into rename-edit of file0 into file1.
  17
  18 Starting from the same two files in the tree, we swap file0 and file1.
  19 With -B, this should be detected as two complete rewrites, resulting in
  20 four changes in total.
  21
  22 Further, with -B and -M together, these should turn into two renames.
  23 '
  24 . ./test-lib.sh
  25 . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
  26
  27 test_expect_success \
  28     setup \
  29     'cat "$TEST_DIRECTORY"/../README >file0 &&
  30      cat "$TEST_DIRECTORY"/../COPYING >file1 &&
  31     git update-index --add file0 file1 &&
  32     tree=$(git write-tree) &&
  33     echo "$tree"'
  34
  35 test_expect_success \
  36     'change file1 with copy-edit of file0 and remove file0' \
  37     'sed -e "s/git/GIT/" file0 >file1 &&
  38      rm -f file0 &&
  39     git update-index --remove file0 file1'
  40
  41 test_expect_success \
  42     'run diff with -B' \
  43     'git diff-index -B --cached "$tree" >current'
  44
  45 cat >expected <<\EOF
  46 :100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D      file0
  47 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 11e331465a89c394dc25c780de230043750c1ec8 M100   file1
  48 EOF
  49
  50 test_expect_success \
  51     'validate result of -B (#1)' \
  52     'compare_diff_raw expected current'
  53
  54 test_expect_success \
  55     'run diff with -B and -M' \
  56     'git diff-index -B -M "$tree" >current'
  57
  58 cat >expected <<\EOF
  59 :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100   file0   file1
  60 EOF
  61
  62 test_expect_success \
  63     'validate result of -B -M (#2)' \
  64     'compare_diff_raw expected current'
  65
  66 test_expect_success \
  67     'swap file0 and file1' \
  68     'rm -f file0 file1 &&
  69      git read-tree -m $tree &&
  70      git checkout-index -f -u -a &&
  71      mv file0 tmp &&
  72      mv file1 file0 &&
  73      mv tmp file1 &&
  74      git update-index file0 file1'
  75
  76 test_expect_success \
  77     'run diff with -B' \
  78     'git diff-index -B "$tree" >current'
  79
  80 cat >expected <<\EOF
  81 :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100   file0
  82 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100   file1
  83 EOF
  84
  85 test_expect_success \
  86     'validate result of -B (#3)' \
  87     'compare_diff_raw expected current'
  88
  89 test_expect_success \
  90     'run diff with -B and -M' \
  91     'git diff-index -B -M "$tree" >current'
  92
  93 cat >expected <<\EOF
  94 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100   file1   file0
  95 :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 R100   file0   file1
  96 EOF
  97
  98 test_expect_success \
  99     'validate result of -B -M (#4)' \
 100     'compare_diff_raw expected current'
 101
 102 test "$no_symlinks" || {
 103
 104 test_expect_success \
 105     'make file0 into something completely different' \
 106     'rm -f file0 &&
 107      ln -s frotz file0 &&
 108      git update-index file0 file1'
 109
 110 test_expect_success \
 111     'run diff with -B' \
 112     'git diff-index -B "$tree" >current'
 113
 114 cat >expected <<\EOF
 115 :100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T      file0
 116 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100   file1
 117 EOF
 118
 119 test_expect_success \
 120     'validate result of -B (#5)' \
 121     'compare_diff_raw expected current'
 122
 123 test_expect_success \
 124     'run diff with -B -M' \
 125     'git diff-index -B -M "$tree" >current'
 126
 127 # file0 changed from regular to symlink.  file1 is very close to the preimage of file0.
 128 # because we break file0, file1 can become a rename of it.
 129 cat >expected <<\EOF
 130 :100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T      file0
 131 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 R      file0   file1
 132 EOF
 133
 134 test_expect_success \
 135     'validate result of -B -M (#6)' \
 136     'compare_diff_raw expected current'
 137
 138 test_expect_success \
 139     'run diff with -M' \
 140     'git diff-index -M "$tree" >current'
 141
 142 # This should not mistake file0 as the copy source of new file1
 143 # due to type differences.
 144 cat >expected <<\EOF
 145 :100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T      file0
 146 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M      file1
 147 EOF
 148
 149 test_expect_success \
 150     'validate result of -M (#7)' \
 151     'compare_diff_raw expected current'
 152
 153 } # end symlink tests
 154
 155 test_expect_success \
 156     'file1 edited to look like file0 and file0 rename-edited to file2' \
 157     'rm -f file0 file1 &&
 158      git read-tree -m $tree &&
 159      git checkout-index -f -u -a &&
 160      sed -e "s/git/GIT/" file0 >file1 &&
 161      sed -e "s/git/GET/" file0 >file2 &&
 162      rm -f file0
 163      git update-index --add --remove file0 file1 file2'
 164
 165 test_expect_success \
 166     'run diff with -B' \
 167     'git diff-index -B "$tree" >current'
 168
 169 cat >expected <<\EOF
 170 :100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D      file0
 171 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 08bb2fb671deff4c03a4d4a0a1315dff98d5732c M100   file1
 172 :000000 100644 0000000000000000000000000000000000000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 A      file2
 173 EOF
 174
 175 test_expect_success \
 176     'validate result of -B (#8)' \
 177     'compare_diff_raw expected current'
 178
 179 test_expect_success \
 180     'run diff with -B -M' \
 181     'git diff-index -B -M "$tree" >current'
 182
 183 cat >expected <<\EOF
 184 :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095   file0   file1
 185 :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 59f832e5c8b3f7e486be15ad0cd3e95ba9af8998 R095   file0   file2
 186 EOF
 187
 188 test_expect_success \
 189     'validate result of -B -M (#9)' \
 190     'compare_diff_raw expected current'
 191
 192 test_done