Merge branch 'jc/diff-test-updates' into maint
Test clean-up. * jc/diff-test-updates: test_ln_s_add: refresh stat info of fake symbolic links t4008: modernise style t/diff-lib: check exact object names in compare_diff_raw tests: do not borrow from COPYING and README from the real source t4010: correct expected object names t9300: correct expected object names t4008: correct stale comments
This commit is contained in:
Junio C Hamano
commit
bb8f6de064
@ -1,6 +1,6 @@
|
||||
:
|
||||
|
||||
sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]* / X X \1# /'
|
||||
sanitize_diff_raw='/^:/s/ '"\($_x40\)"' '"\($_x40\)"' \([A-Z]\)[0-9]* / \1 \2 \3# /'
|
||||
compare_diff_raw () {
|
||||
# When heuristics are improved, the score numbers would change.
|
||||
# Ignore them while comparing.
|
||||
|
||||
361
t/diff-lib/COPYING
Normal file
361
t/diff-lib/COPYING
Normal file
@ -0,0 +1,361 @@
|
||||
|
||||
Note that the only valid version of the GPL as far as this project
|
||||
is concerned is _this_ particular version of the license (ie v2, not
|
||||
v2.2 or v3.x or whatever), unless explicitly otherwise stated.
|
||||
|
||||
HOWEVER, in order to allow a migration to GPLv3 if that seems like
|
||||
a good idea, I also ask that people involved with the project make
|
||||
their preferences known. In particular, if you trust me to make that
|
||||
decision, you might note so in your copyright message, ie something
|
||||
like
|
||||
|
||||
This file is licensed under the GPL v2, or a later version
|
||||
at the discretion of Linus.
|
||||
|
||||
might avoid issues. But we can also just decide to synchronize and
|
||||
contact all copyright holders on record if/when the occasion arises.
|
||||
|
||||
Linus Torvalds
|
||||
|
||||
----------------------------------------
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
46
t/diff-lib/README
Normal file
46
t/diff-lib/README
Normal file
@ -0,0 +1,46 @@
|
||||
////////////////////////////////////////////////////////////////
|
||||
|
||||
GIT - the stupid content tracker
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
|
||||
"git" can mean anything, depending on your mood.
|
||||
|
||||
- random three-letter combination that is pronounceable, and not
|
||||
actually used by any common UNIX command. The fact that it is a
|
||||
mispronunciation of "get" may or may not be relevant.
|
||||
- stupid. contemptible and despicable. simple. Take your pick from the
|
||||
dictionary of slang.
|
||||
- "global information tracker": you're in a good mood, and it actually
|
||||
works for you. Angels sing, and a light suddenly fills the room.
|
||||
- "goddamn idiotic truckload of sh*t": when it breaks
|
||||
|
||||
Git is a fast, scalable, distributed revision control system with an
|
||||
unusually rich command set that provides both high-level operations
|
||||
and full access to internals.
|
||||
|
||||
Git is an Open Source project covered by the GNU General Public License.
|
||||
It was originally written by Linus Torvalds with help of a group of
|
||||
hackers around the net. It is currently maintained by Junio C Hamano.
|
||||
|
||||
Please read the file INSTALL for installation instructions.
|
||||
See Documentation/tutorial.txt to get started, then see
|
||||
Documentation/everyday.txt for a useful minimum set of commands,
|
||||
and "man git-commandname" for documentation of each command.
|
||||
CVS users may also want to read Documentation/cvs-migration.txt.
|
||||
|
||||
Many Git online resources are accessible from http://git.or.cz/
|
||||
including full documentation and Git related tools.
|
||||
|
||||
The user discussion and development of Git take place on the Git
|
||||
mailing list -- everyone is welcome to post bug reports, feature
|
||||
requests, comments and patches to git@vger.kernel.org. To subscribe
|
||||
to the list, send an email with just "subscribe git" in the body to
|
||||
majordomo@vger.kernel.org. The mailing list archives are available at
|
||||
http://marc.theaimsgroup.com/?l=git and other archival sites.
|
||||
|
||||
The messages titled "A note from the maintainer", "What's in
|
||||
git.git (stable)" and "What's cooking in git.git (topics)" and
|
||||
the discussion following them on the mailing list give a good
|
||||
reference for project status, development direction and
|
||||
remaining tasks.
|
||||
@ -11,7 +11,7 @@ test_description='More rename detection
|
||||
|
||||
test_expect_success \
|
||||
'prepare reference tree' \
|
||||
'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
|
||||
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
|
||||
echo frotz >rezrov &&
|
||||
git update-index --add COPYING rezrov &&
|
||||
tree=$(git write-tree) &&
|
||||
@ -99,7 +99,7 @@ test_expect_success \
|
||||
|
||||
test_expect_success \
|
||||
'prepare work tree once again' \
|
||||
'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
|
||||
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
|
||||
git update-index --add --remove COPYING COPYING.1'
|
||||
|
||||
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
|
||||
|
||||
@ -11,7 +11,7 @@ test_description='Same rename detection as t4003 but testing diff-raw.
|
||||
|
||||
test_expect_success \
|
||||
'prepare reference tree' \
|
||||
'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
|
||||
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
|
||||
echo frotz >rezrov &&
|
||||
git update-index --add COPYING rezrov &&
|
||||
tree=$(git write-tree) &&
|
||||
@ -71,7 +71,7 @@ test_expect_success \
|
||||
|
||||
test_expect_success \
|
||||
'prepare work tree once again' \
|
||||
'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
|
||||
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
|
||||
git update-index --add --remove COPYING COPYING.1'
|
||||
|
||||
git diff-index -C --find-copies-harder $tree >current
|
||||
|
||||
@ -11,7 +11,7 @@ test_description='Rename interaction with pathspec.
|
||||
|
||||
test_expect_success 'prepare reference tree' '
|
||||
mkdir path0 path1 &&
|
||||
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
|
||||
cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
|
||||
git update-index --add path0/COPYING &&
|
||||
tree=$(git write-tree) &&
|
||||
echo $tree
|
||||
|
||||
@ -10,179 +10,145 @@ We have two very different files, file0 and file1, registered in a tree.
|
||||
We update file1 so drastically that it is more similar to file0, and
|
||||
then remove file0. With -B, changes to file1 should be broken into
|
||||
separate delete and create, resulting in removal of file0, removal of
|
||||
original file1 and creation of completely rewritten file1.
|
||||
original file1 and creation of completely rewritten file1. The latter
|
||||
two are then merged back into a single "complete rewrite".
|
||||
|
||||
Further, with -B and -M together, these three modifications should
|
||||
turn into rename-edit of file0 into file1.
|
||||
|
||||
Starting from the same two files in the tree, we swap file0 and file1.
|
||||
With -B, this should be detected as two complete rewrites, resulting in
|
||||
four changes in total.
|
||||
With -B, this should be detected as two complete rewrites.
|
||||
|
||||
Further, with -B and -M together, these should turn into two renames.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
|
||||
|
||||
test_expect_success \
|
||||
setup \
|
||||
'cat "$TEST_DIRECTORY"/../README >file0 &&
|
||||
cat "$TEST_DIRECTORY"/../COPYING >file1 &&
|
||||
git update-index --add file0 file1 &&
|
||||
tree=$(git write-tree) &&
|
||||
echo "$tree"'
|
||||
test_expect_success setup '
|
||||
cat "$TEST_DIRECTORY"/diff-lib/README >file0 &&
|
||||
cat "$TEST_DIRECTORY"/diff-lib/COPYING >file1 &&
|
||||
git update-index --add file0 file1 &&
|
||||
git tag reference $(git write-tree)
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'change file1 with copy-edit of file0 and remove file0' \
|
||||
'sed -e "s/git/GIT/" file0 >file1 &&
|
||||
rm -f file0 &&
|
||||
git update-index --remove file0 file1'
|
||||
test_expect_success 'change file1 with copy-edit of file0 and remove file0' '
|
||||
sed -e "s/git/GIT/" file0 >file1 &&
|
||||
rm -f file0 &&
|
||||
git update-index --remove file0 file1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B' \
|
||||
'git diff-index -B --cached "$tree" >current'
|
||||
test_expect_success 'run diff with -B (#1)' '
|
||||
git diff-index -B --cached reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 000000 548142c327a6790ff8821d67c2ee1eff7a656b52 0000000000000000000000000000000000000000 D file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec M100 file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 11e331465a89c394dc25c780de230043750c1ec8 M100 file1
|
||||
EOF
|
||||
test_expect_success 'run diff with -B and -M (#2)' '
|
||||
git diff-index -B -M reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec R100 file0 file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B (#1)' \
|
||||
'compare_diff_raw expected current'
|
||||
test_expect_success 'swap file0 and file1' '
|
||||
rm -f file0 file1 &&
|
||||
git read-tree -m reference &&
|
||||
git checkout-index -f -u -a &&
|
||||
mv file0 tmp &&
|
||||
mv file1 file0 &&
|
||||
mv tmp file1 &&
|
||||
git update-index file0 file1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B and -M' \
|
||||
'git diff-index -B -M "$tree" >current'
|
||||
test_expect_success 'run diff with -B (#3)' '
|
||||
git diff-index -B reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 548142c327a6790ff8821d67c2ee1eff7a656b52 M100 file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100 file0 file1
|
||||
EOF
|
||||
test_expect_success 'run diff with -B and -M (#4)' '
|
||||
git diff-index -B -M reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0
|
||||
:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 548142c327a6790ff8821d67c2ee1eff7a656b52 R100 file0 file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B -M (#2)' \
|
||||
'compare_diff_raw expected current'
|
||||
test_expect_success 'make file0 into something completely different' '
|
||||
rm -f file0 &&
|
||||
test_ln_s_add frotz file0 &&
|
||||
git update-index file1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'swap file0 and file1' \
|
||||
'rm -f file0 file1 &&
|
||||
git read-tree -m $tree &&
|
||||
git checkout-index -f -u -a &&
|
||||
mv file0 tmp &&
|
||||
mv file1 file0 &&
|
||||
mv tmp file1 &&
|
||||
git update-index file0 file1'
|
||||
test_expect_success 'run diff with -B (#5)' '
|
||||
git diff-index -B reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 120000 548142c327a6790ff8821d67c2ee1eff7a656b52 67be421f88824578857624f7b3dc75e99a8a1481 T file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 548142c327a6790ff8821d67c2ee1eff7a656b52 M100 file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B' \
|
||||
'git diff-index -B "$tree" >current'
|
||||
test_expect_success 'run diff with -B -M (#6)' '
|
||||
git diff-index -B -M reference >current &&
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
|
||||
EOF
|
||||
# file0 changed from regular to symlink. file1 is the same as the preimage
|
||||
# of file0. Because the change does not make file0 disappear, file1 is
|
||||
# denoted as a copy of file0
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 120000 548142c327a6790ff8821d67c2ee1eff7a656b52 67be421f88824578857624f7b3dc75e99a8a1481 T file0
|
||||
:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 548142c327a6790ff8821d67c2ee1eff7a656b52 C file0 file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B (#3)' \
|
||||
'compare_diff_raw expected current'
|
||||
test_expect_success 'run diff with -M (#7)' '
|
||||
git diff-index -M reference >current &&
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B and -M' \
|
||||
'git diff-index -B -M "$tree" >current'
|
||||
# This should not mistake file0 as the copy source of new file1
|
||||
# due to type differences.
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 120000 548142c327a6790ff8821d67c2ee1eff7a656b52 67be421f88824578857624f7b3dc75e99a8a1481 T file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 548142c327a6790ff8821d67c2ee1eff7a656b52 M file1
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0
|
||||
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 R100 file0 file1
|
||||
EOF
|
||||
test_expect_success 'file1 edited to look like file0 and file0 rename-edited to file2' '
|
||||
rm -f file0 file1 &&
|
||||
git read-tree -m reference &&
|
||||
git checkout-index -f -u -a &&
|
||||
sed -e "s/git/GIT/" file0 >file1 &&
|
||||
sed -e "s/git/GET/" file0 >file2 &&
|
||||
rm -f file0 &&
|
||||
git update-index --add --remove file0 file1 file2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B -M (#4)' \
|
||||
'compare_diff_raw expected current'
|
||||
test_expect_success 'run diff with -B (#8)' '
|
||||
git diff-index -B reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 000000 548142c327a6790ff8821d67c2ee1eff7a656b52 0000000000000000000000000000000000000000 D file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec M100 file1
|
||||
:000000 100644 0000000000000000000000000000000000000000 69a939f651686f56322566e2fd76715947a24162 A file2
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'make file0 into something completely different' \
|
||||
'rm -f file0 &&
|
||||
test_ln_s_add frotz file0 &&
|
||||
git update-index file1'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B' \
|
||||
'git diff-index -B "$tree" >current'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
|
||||
EOF
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B (#5)' \
|
||||
'compare_diff_raw expected current'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B -M' \
|
||||
'git diff-index -B -M "$tree" >current'
|
||||
|
||||
# file0 changed from regular to symlink. file1 is very close to the preimage of file0.
|
||||
# the change does not make file0 disappear, so file1 is denoted as a copy of file0
|
||||
cat >expected <<\EOF
|
||||
:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 C file0 file1
|
||||
EOF
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B -M (#6)' \
|
||||
'compare_diff_raw expected current'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -M' \
|
||||
'git diff-index -M "$tree" >current'
|
||||
|
||||
# This should not mistake file0 as the copy source of new file1
|
||||
# due to type differences.
|
||||
cat >expected <<\EOF
|
||||
:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M file1
|
||||
EOF
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -M (#7)' \
|
||||
'compare_diff_raw expected current'
|
||||
|
||||
test_expect_success \
|
||||
'file1 edited to look like file0 and file0 rename-edited to file2' \
|
||||
'rm -f file0 file1 &&
|
||||
git read-tree -m $tree &&
|
||||
git checkout-index -f -u -a &&
|
||||
sed -e "s/git/GIT/" file0 >file1 &&
|
||||
sed -e "s/git/GET/" file0 >file2 &&
|
||||
rm -f file0 &&
|
||||
git update-index --add --remove file0 file1 file2'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B' \
|
||||
'git diff-index -B "$tree" >current'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
|
||||
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 08bb2fb671deff4c03a4d4a0a1315dff98d5732c M100 file1
|
||||
:000000 100644 0000000000000000000000000000000000000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 A file2
|
||||
EOF
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B (#8)' \
|
||||
'compare_diff_raw expected current'
|
||||
|
||||
test_expect_success \
|
||||
'run diff with -B -C' \
|
||||
'git diff-index -B -C "$tree" >current'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1
|
||||
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 59f832e5c8b3f7e486be15ad0cd3e95ba9af8998 R095 file0 file2
|
||||
EOF
|
||||
|
||||
test_expect_success \
|
||||
'validate result of -B -M (#9)' \
|
||||
'compare_diff_raw expected current'
|
||||
test_expect_success 'run diff with -B -C (#9)' '
|
||||
git diff-index -B -C reference >current &&
|
||||
cat >expect <<-\EOF &&
|
||||
:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 2fbedd0b5d4b8126e4750c3bee305e8ff79f80ec C095 file0 file1
|
||||
:100644 100644 548142c327a6790ff8821d67c2ee1eff7a656b52 69a939f651686f56322566e2fd76715947a24162 R095 file0 file2
|
||||
EOF
|
||||
compare_diff_raw expect current
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -11,7 +11,7 @@ test_description='Same rename detection as t4003 but testing diff-raw -z.
|
||||
|
||||
test_expect_success \
|
||||
'prepare reference tree' \
|
||||
'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
|
||||
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
|
||||
echo frotz >rezrov &&
|
||||
git update-index --add COPYING rezrov &&
|
||||
tree=$(git write-tree) &&
|
||||
@ -78,7 +78,7 @@ test_expect_success \
|
||||
|
||||
test_expect_success \
|
||||
'prepare work tree once again' \
|
||||
'cat "$TEST_DIRECTORY"/../COPYING >COPYING &&
|
||||
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
|
||||
git update-index --add --remove COPYING COPYING.1'
|
||||
|
||||
git diff-index -z -C --find-copies-harder $tree >current
|
||||
|
||||
@ -56,7 +56,7 @@ test_expect_success \
|
||||
compare_diff_raw current expected'
|
||||
|
||||
cat >expected <<\EOF
|
||||
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M file0
|
||||
:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df dca6b92303befc93086aa025d90a5facd7eb2812 M file0
|
||||
EOF
|
||||
test_expect_success \
|
||||
'limit to file0 should show file0' \
|
||||
|
||||
@ -552,8 +552,8 @@ test_expect_success 'D: verify pack' '
|
||||
'
|
||||
|
||||
cat >expect <<EOF
|
||||
:000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
|
||||
:000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
|
||||
:000000 100755 0000000000000000000000000000000000000000 e74b7d465e52746be2b4bae983670711e6e66657 A newdir/exec.sh
|
||||
:000000 100644 0000000000000000000000000000000000000000 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 A newdir/interesting
|
||||
EOF
|
||||
git diff-tree -M -r branch^ branch >actual
|
||||
test_expect_success \
|
||||
|
||||
@ -745,7 +745,9 @@ test_ln_s_add () {
|
||||
else
|
||||
printf '%s' "$1" >"$2" &&
|
||||
ln_s_obj=$(git hash-object -w "$2") &&
|
||||
git update-index --add --cacheinfo 120000 $ln_s_obj "$2"
|
||||
git update-index --add --cacheinfo 120000 $ln_s_obj "$2" &&
|
||||
# pick up stat info from the file
|
||||
git update-index "$2"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user