tests: do not borrow from COPYING and README from the real source
These two files have been modified since the tests started using as test input, making the exact object names they expect to be different from what actually happens in the trash repository they use to run tests. Instead, take a snapshot of these two files and keep them in t/diff-lib/ so that we can update the real ones without having to worry about breaking tests. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 15, 2015 at 13:44 UTC
459b8d22e544b3876a2270ee7290c289a39ebbb2
7 files changed
+433
-26
t/diff-lib/COPYING
new
+361
@@ -0,0 +1,361 @@
1
+
2
+ Note that the only valid version of the GPL as far as this project
3
+ is concerned is _this_ particular version of the license (ie v2, not
4
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
5
+
6
+ HOWEVER, in order to allow a migration to GPLv3 if that seems like
7
+ a good idea, I also ask that people involved with the project make
8
+ their preferences known. In particular, if you trust me to make that
9
+ decision, you might note so in your copyright message, ie something
10
+ like
11
+
12
+ This file is licensed under the GPL v2, or a later version
13
+ at the discretion of Linus.
14
+
15
+ might avoid issues. But we can also just decide to synchronize and
16
+ contact all copyright holders on record if/when the occasion arises.
17
+
18
+ Linus Torvalds
19
+
20
+----------------------------------------
21
+
22
+ GNU GENERAL PUBLIC LICENSE
23
+ Version 2, June 1991
24
+
25
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
26
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
27
+ Everyone is permitted to copy and distribute verbatim copies
28
+ of this license document, but changing it is not allowed.
29
+
30
+ Preamble
31
+
32
+ The licenses for most software are designed to take away your
33
+freedom to share and change it. By contrast, the GNU General Public
34
+License is intended to guarantee your freedom to share and change free
35
+software--to make sure the software is free for all its users. This
36
+General Public License applies to most of the Free Software
37
+Foundation's software and to any other program whose authors commit to
38
+using it. (Some other Free Software Foundation software is covered by
39
+the GNU Library General Public License instead.) You can apply it to
40
+your programs, too.
41
+
42
+ When we speak of free software, we are referring to freedom, not
43
+price. Our General Public Licenses are designed to make sure that you
44
+have the freedom to distribute copies of free software (and charge for
45
+this service if you wish), that you receive source code or can get it
46
+if you want it, that you can change the software or use pieces of it
47
+in new free programs; and that you know you can do these things.
48
+
49
+ To protect your rights, we need to make restrictions that forbid
50
+anyone to deny you these rights or to ask you to surrender the rights.
51
+These restrictions translate to certain responsibilities for you if you
52
+distribute copies of the software, or if you modify it.
53
+
54
+ For example, if you distribute copies of such a program, whether
55
+gratis or for a fee, you must give the recipients all the rights that
56
+you have. You must make sure that they, too, receive or can get the
57
+source code. And you must show them these terms so they know their
58
+rights.
59
+
60
+ We protect your rights with two steps: (1) copyright the software, and
61
+(2) offer you this license which gives you legal permission to copy,
62
+distribute and/or modify the software.
63
+
64
+ Also, for each author's protection and ours, we want to make certain
65
+that everyone understands that there is no warranty for this free
66
+software. If the software is modified by someone else and passed on, we
67
+want its recipients to know that what they have is not the original, so
68
+that any problems introduced by others will not reflect on the original
69
+authors' reputations.
70
+
71
+ Finally, any free program is threatened constantly by software
72
+patents. We wish to avoid the danger that redistributors of a free
73
+program will individually obtain patent licenses, in effect making the
74
+program proprietary. To prevent this, we have made it clear that any
75
+patent must be licensed for everyone's free use or not licensed at all.
76
+
77
+ The precise terms and conditions for copying, distribution and
78
+modification follow.
79
+
80
+ GNU GENERAL PUBLIC LICENSE
81
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
82
+
83
+ 0. This License applies to any program or other work which contains
84
+a notice placed by the copyright holder saying it may be distributed
85
+under the terms of this General Public License. The "Program", below,
86
+refers to any such program or work, and a "work based on the Program"
87
+means either the Program or any derivative work under copyright law:
88
+that is to say, a work containing the Program or a portion of it,
89
+either verbatim or with modifications and/or translated into another
90
+language. (Hereinafter, translation is included without limitation in
91
+the term "modification".) Each licensee is addressed as "you".
92
+
93
+Activities other than copying, distribution and modification are not
94
+covered by this License; they are outside its scope. The act of
95
+running the Program is not restricted, and the output from the Program
96
+is covered only if its contents constitute a work based on the
97
+Program (independent of having been made by running the Program).
98
+Whether that is true depends on what the Program does.
99
+
100
+ 1. You may copy and distribute verbatim copies of the Program's
101
+source code as you receive it, in any medium, provided that you
102
+conspicuously and appropriately publish on each copy an appropriate
103
+copyright notice and disclaimer of warranty; keep intact all the
104
+notices that refer to this License and to the absence of any warranty;
105
+and give any other recipients of the Program a copy of this License
106
+along with the Program.
107
+
108
+You may charge a fee for the physical act of transferring a copy, and
109
+you may at your option offer warranty protection in exchange for a fee.
110
+
111
+ 2. You may modify your copy or copies of the Program or any portion
112
+of it, thus forming a work based on the Program, and copy and
113
+distribute such modifications or work under the terms of Section 1
114
+above, provided that you also meet all of these conditions:
115
+
116
+ a) You must cause the modified files to carry prominent notices
117
+ stating that you changed the files and the date of any change.
118
+
119
+ b) You must cause any work that you distribute or publish, that in
120
+ whole or in part contains or is derived from the Program or any
121
+ part thereof, to be licensed as a whole at no charge to all third
122
+ parties under the terms of this License.
123
+
124
+ c) If the modified program normally reads commands interactively
125
+ when run, you must cause it, when started running for such
126
+ interactive use in the most ordinary way, to print or display an
127
+ announcement including an appropriate copyright notice and a
128
+ notice that there is no warranty (or else, saying that you provide
129
+ a warranty) and that users may redistribute the program under
130
+ these conditions, and telling the user how to view a copy of this
131
+ License. (Exception: if the Program itself is interactive but
132
+ does not normally print such an announcement, your work based on
133
+ the Program is not required to print an announcement.)
134
+
135
+These requirements apply to the modified work as a whole. If
136
+identifiable sections of that work are not derived from the Program,
137
+and can be reasonably considered independent and separate works in
138
+themselves, then this License, and its terms, do not apply to those
139
+sections when you distribute them as separate works. But when you
140
+distribute the same sections as part of a whole which is a work based
141
+on the Program, the distribution of the whole must be on the terms of
142
+this License, whose permissions for other licensees extend to the
143
+entire whole, and thus to each and every part regardless of who wrote it.
144
+
145
+Thus, it is not the intent of this section to claim rights or contest
146
+your rights to work written entirely by you; rather, the intent is to
147
+exercise the right to control the distribution of derivative or
148
+collective works based on the Program.
149
+
150
+In addition, mere aggregation of another work not based on the Program
151
+with the Program (or with a work based on the Program) on a volume of
152
+a storage or distribution medium does not bring the other work under
153
+the scope of this License.
154
+
155
+ 3. You may copy and distribute the Program (or a work based on it,
156
+under Section 2) in object code or executable form under the terms of
157
+Sections 1 and 2 above provided that you also do one of the following:
158
+
159
+ a) Accompany it with the complete corresponding machine-readable
160
+ source code, which must be distributed under the terms of Sections
161
+ 1 and 2 above on a medium customarily used for software interchange; or,
162
+
163
+ b) Accompany it with a written offer, valid for at least three
164
+ years, to give any third party, for a charge no more than your
165
+ cost of physically performing source distribution, a complete
166
+ machine-readable copy of the corresponding source code, to be
167
+ distributed under the terms of Sections 1 and 2 above on a medium
168
+ customarily used for software interchange; or,
169
+
170
+ c) Accompany it with the information you received as to the offer
171
+ to distribute corresponding source code. (This alternative is
172
+ allowed only for noncommercial distribution and only if you
173
+ received the program in object code or executable form with such
174
+ an offer, in accord with Subsection b above.)
175
+
176
+The source code for a work means the preferred form of the work for
177
+making modifications to it. For an executable work, complete source
178
+code means all the source code for all modules it contains, plus any
179
+associated interface definition files, plus the scripts used to
180
+control compilation and installation of the executable. However, as a
181
+special exception, the source code distributed need not include
182
+anything that is normally distributed (in either source or binary
183
+form) with the major components (compiler, kernel, and so on) of the
184
+operating system on which the executable runs, unless that component
185
+itself accompanies the executable.
186
+
187
+If distribution of executable or object code is made by offering
188
+access to copy from a designated place, then offering equivalent
189
+access to copy the source code from the same place counts as
190
+distribution of the source code, even though third parties are not
191
+compelled to copy the source along with the object code.
192
+
193
+ 4. You may not copy, modify, sublicense, or distribute the Program
194
+except as expressly provided under this License. Any attempt
195
+otherwise to copy, modify, sublicense or distribute the Program is
196
+void, and will automatically terminate your rights under this License.
197
+However, parties who have received copies, or rights, from you under
198
+this License will not have their licenses terminated so long as such
199
+parties remain in full compliance.
200
+
201
+ 5. You are not required to accept this License, since you have not
202
+signed it. However, nothing else grants you permission to modify or
203
+distribute the Program or its derivative works. These actions are
204
+prohibited by law if you do not accept this License. Therefore, by
205
+modifying or distributing the Program (or any work based on the
206
+Program), you indicate your acceptance of this License to do so, and
207
+all its terms and conditions for copying, distributing or modifying
208
+the Program or works based on it.
209
+
210
+ 6. Each time you redistribute the Program (or any work based on the
211
+Program), the recipient automatically receives a license from the
212
+original licensor to copy, distribute or modify the Program subject to
213
+these terms and conditions. You may not impose any further
214
+restrictions on the recipients' exercise of the rights granted herein.
215
+You are not responsible for enforcing compliance by third parties to
216
+this License.
217
+
218
+ 7. If, as a consequence of a court judgment or allegation of patent
219
+infringement or for any other reason (not limited to patent issues),
220
+conditions are imposed on you (whether by court order, agreement or
221
+otherwise) that contradict the conditions of this License, they do not
222
+excuse you from the conditions of this License. If you cannot
223
+distribute so as to satisfy simultaneously your obligations under this
224
+License and any other pertinent obligations, then as a consequence you
225
+may not distribute the Program at all. For example, if a patent
226
+license would not permit royalty-free redistribution of the Program by
227
+all those who receive copies directly or indirectly through you, then
228
+the only way you could satisfy both it and this License would be to
229
+refrain entirely from distribution of the Program.
230
+
231
+If any portion of this section is held invalid or unenforceable under
232
+any particular circumstance, the balance of the section is intended to
233
+apply and the section as a whole is intended to apply in other
234
+circumstances.
235
+
236
+It is not the purpose of this section to induce you to infringe any
237
+patents or other property right claims or to contest validity of any
238
+such claims; this section has the sole purpose of protecting the
239
+integrity of the free software distribution system, which is
240
+implemented by public license practices. Many people have made
241
+generous contributions to the wide range of software distributed
242
+through that system in reliance on consistent application of that
243
+system; it is up to the author/donor to decide if he or she is willing
244
+to distribute software through any other system and a licensee cannot
245
+impose that choice.
246
+
247
+This section is intended to make thoroughly clear what is believed to
248
+be a consequence of the rest of this License.
249
+
250
+ 8. If the distribution and/or use of the Program is restricted in
251
+certain countries either by patents or by copyrighted interfaces, the
252
+original copyright holder who places the Program under this License
253
+may add an explicit geographical distribution limitation excluding
254
+those countries, so that distribution is permitted only in or among
255
+countries not thus excluded. In such case, this License incorporates
256
+the limitation as if written in the body of this License.
257
+
258
+ 9. The Free Software Foundation may publish revised and/or new versions
259
+of the General Public License from time to time. Such new versions will
260
+be similar in spirit to the present version, but may differ in detail to
261
+address new problems or concerns.
262
+
263
+Each version is given a distinguishing version number. If the Program
264
+specifies a version number of this License which applies to it and "any
265
+later version", you have the option of following the terms and conditions
266
+either of that version or of any later version published by the Free
267
+Software Foundation. If the Program does not specify a version number of
268
+this License, you may choose any version ever published by the Free Software
269
+Foundation.
270
+
271
+ 10. If you wish to incorporate parts of the Program into other free
272
+programs whose distribution conditions are different, write to the author
273
+to ask for permission. For software which is copyrighted by the Free
274
+Software Foundation, write to the Free Software Foundation; we sometimes
275
+make exceptions for this. Our decision will be guided by the two goals
276
+of preserving the free status of all derivatives of our free software and
277
+of promoting the sharing and reuse of software generally.
278
+
279
+ NO WARRANTY
280
+
281
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
282
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
283
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
284
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
285
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
286
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
287
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
288
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
289
+REPAIR OR CORRECTION.
290
+
291
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
292
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
293
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
294
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
295
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
296
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
297
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
298
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
299
+POSSIBILITY OF SUCH DAMAGES.
300
+
301
+ END OF TERMS AND CONDITIONS
302
+
303
+ How to Apply These Terms to Your New Programs
304
+
305
+ If you develop a new program, and you want it to be of the greatest
306
+possible use to the public, the best way to achieve this is to make it
307
+free software which everyone can redistribute and change under these terms.
308
+
309
+ To do so, attach the following notices to the program. It is safest
310
+to attach them to the start of each source file to most effectively
311
+convey the exclusion of warranty; and each file should have at least
312
+the "copyright" line and a pointer to where the full notice is found.
313
+
314
+ <one line to give the program's name and a brief idea of what it does.>
315
+ Copyright (C) <year> <name of author>
316
+
317
+ This program is free software; you can redistribute it and/or modify
318
+ it under the terms of the GNU General Public License as published by
319
+ the Free Software Foundation; either version 2 of the License, or
320
+ (at your option) any later version.
321
+
322
+ This program is distributed in the hope that it will be useful,
323
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
324
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
325
+ GNU General Public License for more details.
326
+
327
+ You should have received a copy of the GNU General Public License
328
+ along with this program; if not, write to the Free Software
329
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
330
+
331
+
332
+Also add information on how to contact you by electronic and paper mail.
333
+
334
+If the program is interactive, make it output a short notice like this
335
+when it starts in an interactive mode:
336
+
337
+ Gnomovision version 69, Copyright (C) year name of author
338
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
339
+ This is free software, and you are welcome to redistribute it
340
+ under certain conditions; type `show c' for details.
341
+
342
+The hypothetical commands `show w' and `show c' should show the appropriate
343
+parts of the General Public License. Of course, the commands you use may
344
+be called something other than `show w' and `show c'; they could even be
345
+mouse-clicks or menu items--whatever suits your program.
346
+
347
+You should also get your employer (if you work as a programmer) or your
348
+school, if any, to sign a "copyright disclaimer" for the program, if
349
+necessary. Here is a sample; alter the names:
350
+
351
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
352
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
353
+
354
+ <signature of Ty Coon>, 1 April 1989
355
+ Ty Coon, President of Vice
356
+
357
+This General Public License does not permit incorporating your program into
358
+proprietary programs. If your program is a subroutine library, you may
359
+consider it more useful to permit linking proprietary applications with the
360
+library. If this is what you want to do, use the GNU Library General
361
+Public License instead of this License.
t/diff-lib/README
new
+46
@@ -0,0 +1,46 @@
1
+////////////////////////////////////////////////////////////////
2
+
3
+ GIT - the stupid content tracker
4
+
5
+////////////////////////////////////////////////////////////////
6
+
7
+"git" can mean anything, depending on your mood.
8
+
9
+ - random three-letter combination that is pronounceable, and not
10
+ actually used by any common UNIX command. The fact that it is a
11
+ mispronunciation of "get" may or may not be relevant.
12
+ - stupid. contemptible and despicable. simple. Take your pick from the
13
+ dictionary of slang.
14
+ - "global information tracker": you're in a good mood, and it actually
15
+ works for you. Angels sing, and a light suddenly fills the room.
16
+ - "goddamn idiotic truckload of sh*t": when it breaks
17
+
18
+Git is a fast, scalable, distributed revision control system with an
19
+unusually rich command set that provides both high-level operations
20
+and full access to internals.
21
+
22
+Git is an Open Source project covered by the GNU General Public License.
23
+It was originally written by Linus Torvalds with help of a group of
24
+hackers around the net. It is currently maintained by Junio C Hamano.
25
+
26
+Please read the file INSTALL for installation instructions.
27
+See Documentation/tutorial.txt to get started, then see
28
+Documentation/everyday.txt for a useful minimum set of commands,
29
+and "man git-commandname" for documentation of each command.
30
+CVS users may also want to read Documentation/cvs-migration.txt.
31
+
32
+Many Git online resources are accessible from http://git.or.cz/
33
+including full documentation and Git related tools.
34
+
35
+The user discussion and development of Git take place on the Git
36
+mailing list -- everyone is welcome to post bug reports, feature
37
+requests, comments and patches to git@vger.kernel.org. To subscribe
38
+to the list, send an email with just "subscribe git" in the body to
39
+majordomo@vger.kernel.org. The mailing list archives are available at
40
+http://marc.theaimsgroup.com/?l=git and other archival sites.
41
+
42
+The messages titled "A note from the maintainer", "What's in
43
+git.git (stable)" and "What's cooking in git.git (topics)" and
44
+the discussion following them on the mailing list give a good
45
+reference for project status, development direction and
46
+remaining tasks.
t/t4003-diff-rename-1.sh
+2
-2
@@ -11,7 +11,7 @@ test_description='More rename detection
11
12
test_expect_success \
13
'prepare reference tree' \
14
- 'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
14
+ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
15
echo frotz >rezrov &&
16
git update-index --add COPYING rezrov &&
17
tree=$(git write-tree) &&
@@ -99,7 +99,7 @@ test_expect_success \
99
100
test_expect_success \
101
'prepare work tree once again' \
102
- 'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
102
+ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
103
git update-index --add --remove COPYING COPYING.1'
104
105
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
t/t4005-diff-rename-2.sh
+2
-2
@@ -11,7 +11,7 @@ test_description='Same rename detection as t4003 but testing diff-raw.
11
12
test_expect_success \
13
'prepare reference tree' \
14
- 'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
14
+ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
15
echo frotz >rezrov &&
16
git update-index --add COPYING rezrov &&
17
tree=$(git write-tree) &&
@@ -71,7 +71,7 @@ test_expect_success \
71
72
test_expect_success \
73
'prepare work tree once again' \
74
- 'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
74
+ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
75
git update-index --add --remove COPYING COPYING.1'
76
77
git diff-index -C --find-copies-harder $tree >current
t/t4007-rename-3.sh
+1
-1
@@ -11,7 +11,7 @@ test_description='Rename interaction with pathspec.
11
12
test_expect_success 'prepare reference tree' '
13
mkdir path0 path1 &&
14
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
14
+ cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
15
git update-index --add path0/COPYING &&
16
tree=$(git write-tree) &&
17
echo $tree
t/t4008-diff-break-rewrite.sh
+19
-19
@@ -26,8 +26,8 @@ Further, with -B and -M together, these should turn into two renames.
26
27
test_expect_success \
28
setup \
29
- 'cat "$TEST_DIRECTORY"/../README >file0 &&
30
- cat "$TEST_DIRECTORY"/../COPYING >file1 &&
29
+ 'cat "$TEST_DIRECTORY"/diff-lib/README >file0 &&
30
+ cat "$TEST_DIRECTORY"/diff-lib/COPYING >file1 &&
31
git update-index --add file0 file1 &&
32
tree=$(git write-tree) &&
33
echo "$tree"'
@@ -43,8 +43,8 @@ test_expect_success \
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
46
+:100644 000000 548142c327a6790ff8821d67c2ee1eff7a656b52 0000000000000000000000000000000000000000 D file0
47
+:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec M100 file1
48
EOF
49
50
test_expect_success \
@@ -56,7 +56,7 @@ test_expect_success \
56
'git diff-index -B -M "$tree" >current'
57
58
cat >expected <<\EOF
59
-:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100 file0 file1
59
+:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec R100 file0 file1
60
EOF
61
62
test_expect_success \
@@ -78,8 +78,8 @@ test_expect_success \
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
81
+:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0
82
+:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 548142c327a6790ff8821d67c2ee1eff7a656b52 M100 file1
83
EOF
84
85
test_expect_success \
@@ -92,7 +92,7 @@ test_expect_success \
92
93
cat >expected <<\EOF
94
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0
95
-:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 R100 file0 file1
95
+:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 548142c327a6790ff8821d67c2ee1eff7a656b52 R100 file0 file1
96
EOF
97
98
test_expect_success \
@@ -110,8 +110,8 @@ test_expect_success \
110
'git diff-index -B "$tree" >current'
111
112
cat >expected <<\EOF
113
-:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
114
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
113
+:100644 120000 548142c327a6790ff8821d67c2ee1eff7a656b52 67be421f88824578857624f7b3dc75e99a8a1481 T file0
114
+:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 548142c327a6790ff8821d67c2ee1eff7a656b52 M100 file1
115
EOF
116
117
test_expect_success \
@@ -125,8 +125,8 @@ test_expect_success \
125
# file0 changed from regular to symlink. file1 is very close to the preimage of file0.
126
# the change does not make file0 disappear, so file1 is denoted as a copy of file0
127
cat >expected <<\EOF
128
-:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
129
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 C file0 file1
128
+:100644 120000 548142c327a6790ff8821d67c2ee1eff7a656b52 67be421f88824578857624f7b3dc75e99a8a1481 T file0
129
+:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 548142c327a6790ff8821d67c2ee1eff7a656b52 C file0 file1
130
EOF
131
132
test_expect_success \
@@ -140,8 +140,8 @@ test_expect_success \
140
# This should not mistake file0 as the copy source of new file1
141
# due to type differences.
142
cat >expected <<\EOF
143
-:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
144
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M file1
143
+:100644 120000 548142c327a6790ff8821d67c2ee1eff7a656b52 67be421f88824578857624f7b3dc75e99a8a1481 T file0
144
+:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 548142c327a6790ff8821d67c2ee1eff7a656b52 M file1
145
EOF
146
147
test_expect_success \
@@ -163,9 +163,9 @@ test_expect_success \
163
'git diff-index -B "$tree" >current'
164
165
cat >expected <<\EOF
166
-:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
167
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 08bb2fb671deff4c03a4d4a0a1315dff98d5732c M100 file1
168
-:000000 100644 0000000000000000000000000000000000000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 A file2
166
+:100644 000000 548142c327a6790ff8821d67c2ee1eff7a656b52 0000000000000000000000000000000000000000 D file0
167
+:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec M100 file1
168
+:000000 100644 0000000000000000000000000000000000000000 69a939f651686f56322566e2fd76715947a24162 A file2
169
EOF
170
171
test_expect_success \
@@ -177,8 +177,8 @@ test_expect_success \
177
'git diff-index -B -C "$tree" >current'
178
179
cat >expected <<\EOF
180
-:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1
181
-:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 59f832e5c8b3f7e486be15ad0cd3e95ba9af8998 R095 file0 file2
180
+:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec C095 file0 file1
181
+:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 69a939f651686f56322566e2fd76715947a24162 R095 file0 file2
182
EOF
183
184
test_expect_success \
t/t4009-diff-rename-4.sh
+2
-2
@@ -11,7 +11,7 @@ test_description='Same rename detection as t4003 but testing diff-raw -z.
11
12
test_expect_success \
13
'prepare reference tree' \
14
- 'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
14
+ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
15
echo frotz >rezrov &&
16
git update-index --add COPYING rezrov &&
17
tree=$(git write-tree) &&
@@ -78,7 +78,7 @@ test_expect_success \
78
79
test_expect_success \
80
'prepare work tree once again' \
81
- 'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
81
+ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
82
git update-index --add --remove COPYING COPYING.1'
83
84
git diff-index -z -C --find-copies-harder $tree >current