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

t1000: fix case table.

Browse Source 
Case #10 is not handled with unpack-trees.c:threeway_merge()
internally, unless under the agressive rule, and it is not a
bug.  As the test expects, ND (one side did not do anything,
other side deleted) case was meant to be handled by the caller's
policy (e.g. git-merge-one-file or git-merge-recursive).

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2007-04-07 05:42:01 -07:00
parent 8ff21b1a33
commit ea4b52a86f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,7 @@ checked.
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 remove ditto 10 exists O==A missing no merge must match A
------------------------------------------------------------------ ------------------------------------------------------------------
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.

2
unpack-trees.c
View File

@ -786,7 +786,7 @@ int threeway_merge(struct cache_entry **stages,
o->nontrivial_merge = 1; o->nontrivial_merge = 1;
/* #2, #3, #4, #6, #7, #9, #11. */ /* #2, #3, #4, #6, #7, #9, #10, #11. */
count = 0; count = 0;
if (!head_match || !remote_match) { if (!head_match || !remote_match) {
for (i = 1; i < o->head_idx; i++) { for (i = 1; i < o->head_idx; i++) {