mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / t / t4005-diff-rename-2.sh
blob66300173124eee8480e7214322faf8bc493ad940
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 test_description='Same rename detection as t4003 but testing diff-raw.
9 . ./test-lib.sh
10 . ../diff-lib.sh ;# test-lib chdir's into trash
12 test_expect_success \
13 'prepare reference tree' \
14 'cat ../../COPYING >COPYING &&
15 echo frotz >rezrov &&
16 git update-index --add COPYING rezrov &&
17 tree=$(git write-tree) &&
18 echo $tree'
20 test_expect_success \
21 'prepare work tree' \
22 'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
23 sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
24 rm -f COPYING &&
25 git update-index --add --remove COPYING COPYING.?'
27 # tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2,
28 # both are slightly edited, and unchanged rezrov. We say COPYING.1
29 # and COPYING.2 are based on COPYING, and do not say anything about
30 # rezrov.
32 git diff-index -M $tree >current
34 cat >expected <<\EOF
35 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1
36 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234 COPYING COPYING.2
37 EOF
39 test_expect_success \
40 'validate output from rename/copy detection (#1)' \
41 'compare_diff_raw current expected'
43 ################################################################
45 test_expect_success \
46 'prepare work tree again' \
47 'mv COPYING.2 COPYING &&
48 git update-index --add --remove COPYING COPYING.1 COPYING.2'
50 # tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
51 # both are slightly edited, and unchanged rezrov. We say COPYING.1
52 # is based on COPYING and COPYING is still there, and do not say anything
53 # about rezrov.
55 git diff-index -C $tree >current
56 cat >expected <<\EOF
57 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M COPYING
58 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1
59 EOF
61 test_expect_success \
62 'validate output from rename/copy detection (#2)' \
63 'compare_diff_raw current expected'
65 ################################################################
67 # tree has COPYING and rezrov. work tree has the same COPYING and
68 # copy-edited COPYING.1, and unchanged rezrov. We should not say
69 # anything about rezrov nor COPYING, since the revised again diff-raw
70 # nows how to say Copy.
72 test_expect_success \
73 'prepare work tree once again' \
74 'cat ../../COPYING >COPYING &&
75 git update-index --add --remove COPYING COPYING.1'
77 git diff-index -C --find-copies-harder $tree >current
78 cat >expected <<\EOF
79 :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1
80 EOF
82 test_expect_success \
83 'validate output from rename/copy detection (#3)' \
84 'compare_diff_raw current expected'
86 test_done