summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-06 19:53:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-11 01:27:42 (GMT)
commit4d3fe0c5f342d0b00209916cf6951c2f8db414d2 (patch)
treeb4a36de7aaaf6c546f4b8798d92b0cefaa6522fa /t
parent2ab706a38fbe6f4adb2fd09806a5d5faf33d355f (diff)
downloadgit-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.zip
git-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.tar.gz
git-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.tar.bz2
[PATCH] Add debugging help for case #16 to read-tree.c
This will help us detect if real-world example merges have multiple merge-base candidates and one of them matches one head while another matches the other head. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t1000-read-tree-m-3way.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index f1cd50c..c387e9e 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -218,6 +218,9 @@ currently implemented.
or (2) match B.
------------------------------------------------------------------
15 exists O==A O==B take B must match A if exists.
+ ------------------------------------------------------------------
+ 16 exists O==A O==B barf must match A if exists.
+ *multi* in one in another
-------------------------------------------------------------------
Note: if we want to implement 2ALT and 3ALT we need to be careful.
@@ -514,4 +517,17 @@ test_expect_failure \
git-update-index --add NN &&
git-read-tree -m $tree_O $tree_A $tree_B"
+# #16
+test_expect_success \
+ '16 - A matches in one and B matches in another.' \
+ 'rm -f .git/index F16 &&
+ echo F16 >F16 &&
+ git-update-index --add F16 &&
+ tree0=`git-write-tree` &&
+ echo E16 >F16 &&
+ git-update-index F16 &&
+ tree1=`git-write-tree` &&
+ git-read-tree -m $tree0 $tree1 $tree1 $tree0 &&
+ git-ls-files --stage'
+
test_done