mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the case table in t/t1000.

Browse Source 
It still talked about "the proposed alternative semantics" but we have
used those alternative semantics for quite some time.  Update them to
avoid confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-09-28 12:56:18 -07:00
parent d710b2655c
commit 3e03aaf523
1 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
t/t1000-read-tree-m-3way.sh
View File

@ -158,49 +158,33 @@ test_expect_success \
We have so far tested only empty index and clean-and-matching-A index We have so far tested only empty index and clean-and-matching-A index
case which are trivial. Make sure index requirements are also case which are trivial. Make sure index requirements are also
checked. The table also lists alternative semantics which is not checked.
currently implemented.
"git-diff-tree -m O A B" "git-read-tree -m O A B"
O A B result index requirements O A B result index requirements
------------------------------------------------------------------- -------------------------------------------------------------------
1 missing missing missing - must not exist. 1 missing missing missing - must not exist.
------------------------------------------------------------------ ------------------------------------------------------------------
2 missing missing exists no merge must not exist. 2 missing missing exists take B* must match B, if exists.
------------------------------------
(ALT) take B* must match B, if exists.
------------------------------------------------------------------ ------------------------------------------------------------------
3 missing exists missing no merge must match A and be 3 missing exists missing take A* must match A, if exists.
up-to-date, if exists.
------------------------------------
(ALT) take A* must match A, if exists.
------------------------------------------------------------------ ------------------------------------------------------------------
4 missing exists A!=B no merge must match A and be 4 missing exists A!=B no merge must match A and be
up-to-date, if exists. up-to-date, if exists.
------------------------------------------------------------------ ------------------------------------------------------------------
5 missing exists A==B no merge must match A and be 5 missing exists A==B take A must match A, if exists.
up-to-date, if exists.
------------------------------------
(ALT) take A must match A, if exists.
------------------------------------------------------------------ ------------------------------------------------------------------
6 exists missing missing no merge must not exist. 6 exists missing missing remove must not exist.
------------------------------------
(ALT) remove must not exist.
------------------------------------------------------------------ ------------------------------------------------------------------
7 exists missing O!=B no merge must not exist. 7 exists missing O!=B no merge must not exist.
------------------------------------------------------------------ ------------------------------------------------------------------
8 exists missing O==B no merge must not exist. 8 exists missing O==B remove must not exist.
------------------------------------
(ALT) remove must not exist.
------------------------------------------------------------------ ------------------------------------------------------------------
9 exists O!=A missing no merge must match A and be 9 exists O!=A missing no merge must match A and be
up-to-date, if exists. up-to-date, if exists.
------------------------------------------------------------------ ------------------------------------------------------------------
10 exists O==A missing no merge must match A and be 10 exists O==A missing remove ditto
up-to-date, if exists.
------------------------------------
(ALT) remove ditto
------------------------------------------------------------------ ------------------------------------------------------------------
11 exists O!=A O!=B no merge must match A and be 11 exists O!=A O!=B no merge must match A and be
A!=B up-to-date, if exists. A!=B up-to-date, if exists.
@ -210,10 +194,7 @@ currently implemented.
------------------------------------------------------------------ ------------------------------------------------------------------
13 exists O!=A O==B take A must match A, if exists. 13 exists O!=A O==B take A must match A, if exists.
------------------------------------------------------------------ ------------------------------------------------------------------
14 exists O==A O!=B take B must match A and be 14 exists O==A O!=B take B if exists, must either (1)
be up-to-date, if exists.
------------------------------------
(ALT) take B if exists, must either (1)
match A and be up-to-date, match A and be up-to-date,
or (2) match B. or (2) match B.
------------------------------------------------------------------ ------------------------------------------------------------------
@ -223,9 +204,9 @@ currently implemented.
*multi* in one in another *multi* in one in another
------------------------------------------------------------------- -------------------------------------------------------------------
Note: if we want to implement 2ALT and 3ALT we need to be careful. Note: we need to be careful in case 2 and 3. The tree A may contain
The tree A may contain DF (file) when tree B require DF to be a DF (file) when tree B require DF to be a directory by having DF/DF
directory by having DF/DF (file). (file).
END_OF_CASE_TABLE END_OF_CASE_TABLE