blob: 5836e3a899d62c3c86482ea254eb53c015a52823 [file] [log] [blame]
Junio C Hamanof345b0a2005-05-30 00:08:37 -07001#!/bin/sh
2#
3# Copyright (c) 2005 Junio C Hamano
4#
5
6test_description='Break and then rename
7
8We have two very different files, file0 and file1, registered in a tree.
9
10We update file1 so drastically that it is more similar to file0, and
11then remove file0. With -B, changes to file1 should be broken into
12separate delete and create, resulting in removal of file0, removal of
13original file1 and creation of completely rewritten file1.
14
15Further, with -B and -M together, these three modifications should
16turn into rename-edit of file0 into file1.
17
18Starting from the same two files in the tree, we swap file0 and file1.
19With -B, this should be detected as two complete rewrites, resulting in
20four changes in total.
21
22Further, with -B and -M together, these should turn into two renames.
23'
24. ./test-lib.sh
Junio C Hamanoedb0c722005-05-31 14:47:25 -070025. ../diff-lib.sh ;# test-lib chdir's into trash
Junio C Hamanof345b0a2005-05-30 00:08:37 -070026
27test_expect_success \
28 setup \
29 'cat ../../README >file0 &&
30 cat ../../COPYING >file1 &&
Junio C Hamano5be60072007-07-02 22:52:14 -070031 git update-index --add file0 file1 &&
32 tree=$(git write-tree) &&
Junio C Hamanof345b0a2005-05-30 00:08:37 -070033 echo "$tree"'
34
35test_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 &&
Junio C Hamano5be60072007-07-02 22:52:14 -070039 git update-index --remove file0 file1'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070040
41test_expect_success \
42 'run diff with -B' \
Junio C Hamano5be60072007-07-02 22:52:14 -070043 'git diff-index -B --cached "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070044
45cat >expected <<\EOF
46:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
Junio C Hamano366175e2005-06-19 13:17:50 -070047:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 11e331465a89c394dc25c780de230043750c1ec8 M100 file1
Junio C Hamanof345b0a2005-05-30 00:08:37 -070048EOF
49
50test_expect_success \
51 'validate result of -B (#1)' \
Junio C Hamano366175e2005-06-19 13:17:50 -070052 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070053
54test_expect_success \
55 'run diff with -B and -M' \
Junio C Hamano5be60072007-07-02 22:52:14 -070056 'git diff-index -B -M "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070057
58cat >expected <<\EOF
59:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100 file0 file1
60EOF
61
62test_expect_success \
63 'validate result of -B -M (#2)' \
Junio C Hamano366175e2005-06-19 13:17:50 -070064 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070065
66test_expect_success \
67 'swap file0 and file1' \
68 'rm -f file0 file1 &&
Junio C Hamano5be60072007-07-02 22:52:14 -070069 git read-tree -m $tree &&
70 git checkout-index -f -u -a &&
Junio C Hamanof345b0a2005-05-30 00:08:37 -070071 mv file0 tmp &&
72 mv file1 file0 &&
73 mv tmp file1 &&
Junio C Hamano5be60072007-07-02 22:52:14 -070074 git update-index file0 file1'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070075
76test_expect_success \
77 'run diff with -B' \
Junio C Hamano5be60072007-07-02 22:52:14 -070078 'git diff-index -B "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070079
80cat >expected <<\EOF
Junio C Hamano366175e2005-06-19 13:17:50 -070081:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0
82:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
Junio C Hamanof345b0a2005-05-30 00:08:37 -070083EOF
84
85test_expect_success \
86 'validate result of -B (#3)' \
Junio C Hamano366175e2005-06-19 13:17:50 -070087 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070088
89test_expect_success \
90 'run diff with -B and -M' \
Junio C Hamano5be60072007-07-02 22:52:14 -070091 'git diff-index -B -M "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -070092
93cat >expected <<\EOF
94:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0
95:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 R100 file0 file1
96EOF
97
98test_expect_success \
99 'validate result of -B -M (#4)' \
Junio C Hamano366175e2005-06-19 13:17:50 -0700100 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700101
102test_expect_success \
103 'make file0 into something completely different' \
104 'rm -f file0 &&
105 ln -s frotz file0 &&
Junio C Hamano5be60072007-07-02 22:52:14 -0700106 git update-index file0 file1'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700107
108test_expect_success \
109 'run diff with -B' \
Junio C Hamano5be60072007-07-02 22:52:14 -0700110 'git diff-index -B "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700111
112cat >expected <<\EOF
113:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
Junio C Hamano366175e2005-06-19 13:17:50 -0700114:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700115EOF
116
117test_expect_success \
118 'validate result of -B (#5)' \
Junio C Hamano366175e2005-06-19 13:17:50 -0700119 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700120
121test_expect_success \
122 'run diff with -B' \
Junio C Hamano5be60072007-07-02 22:52:14 -0700123 'git diff-index -B -M "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700124
125# This should not mistake file0 as the copy source of new file1
126# due to type differences.
127cat >expected <<\EOF
128:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
Junio C Hamano366175e2005-06-19 13:17:50 -0700129:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700130EOF
131
132test_expect_success \
133 'validate result of -B -M (#6)' \
Junio C Hamano366175e2005-06-19 13:17:50 -0700134 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700135
136test_expect_success \
137 'run diff with -M' \
Junio C Hamano5be60072007-07-02 22:52:14 -0700138 'git diff-index -M "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700139
140# This should not mistake file0 as the copy source of new file1
141# due to type differences.
142cat >expected <<\EOF
143:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
144:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M file1
145EOF
146
147test_expect_success \
148 'validate result of -M (#7)' \
Junio C Hamano366175e2005-06-19 13:17:50 -0700149 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700150
151test_expect_success \
152 'file1 edited to look like file0 and file0 rename-edited to file2' \
153 'rm -f file0 file1 &&
Junio C Hamano5be60072007-07-02 22:52:14 -0700154 git read-tree -m $tree &&
155 git checkout-index -f -u -a &&
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700156 sed -e "s/git/GIT/" file0 >file1 &&
157 sed -e "s/git/GET/" file0 >file2 &&
158 rm -f file0
Junio C Hamano5be60072007-07-02 22:52:14 -0700159 git update-index --add --remove file0 file1 file2'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700160
161test_expect_success \
162 'run diff with -B' \
Junio C Hamano5be60072007-07-02 22:52:14 -0700163 'git diff-index -B "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700164
165cat >expected <<\EOF
166:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
Junio C Hamano366175e2005-06-19 13:17:50 -0700167:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 08bb2fb671deff4c03a4d4a0a1315dff98d5732c M100 file1
Junio C Hamano2bbcdde2005-07-26 00:22:43 -0700168:000000 100644 0000000000000000000000000000000000000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 A file2
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700169EOF
170
171test_expect_success \
172 'validate result of -B (#8)' \
Junio C Hamano366175e2005-06-19 13:17:50 -0700173 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700174
175test_expect_success \
176 'run diff with -B -M' \
Junio C Hamano5be60072007-07-02 22:52:14 -0700177 'git diff-index -B -M "$tree" >current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700178
179cat >expected <<\EOF
180:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1
181:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 59f832e5c8b3f7e486be15ad0cd3e95ba9af8998 R095 file0 file2
182EOF
183
184test_expect_success \
185 'validate result of -B -M (#9)' \
Junio C Hamano366175e2005-06-19 13:17:50 -0700186 'compare_diff_raw expected current'
Junio C Hamanof345b0a2005-05-30 00:08:37 -0700187
188test_done