[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>

diff --git a/read-tree.c b/read-tree.c
index fed2a3c544c0090d04175042fe5999d9c86bc1a9..3808d2398db1222f5f5e5da0610d8efaae676784 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -3,6 +3,8 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define DBRT_DEBUG 1
+
 #include "cache.h"
 
 #include "object.h"
@@ -47,8 +49,6 @@ static int entcmp(char *name1, int dir1, char *name2, int dir2)
        return ret;
 }
 
-#define DBRT_DEBUG 0
-
 static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                            const char *base, merge_fn_t fn, int *indpos)
 {
@@ -101,14 +101,14 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        }
                }
 
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                if (first)
                        printf("index %s\n", first);
 #endif
                for (i = 0; i < len; i++) {
                        if (!posns[i] || posns[i] == &df_conflict_list)
                                continue;
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                        printf("%d %s\n", i + 1, posns[i]->name);
 #endif
                        if (!first || entcmp(first, firstdir,
@@ -188,7 +188,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        if (merge) {
                                int ret;
 
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                                printf("%s:\n", first);
                                for (i = 0; i < src_size; i++) {
                                        printf(" %d ", i);
@@ -200,7 +200,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
 #endif
                                ret = fn(src);
                                
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                                printf("Added %d entries\n", ret);
 #endif
                                *indpos += ret;
@@ -353,6 +353,19 @@ static int keep_entry(struct cache_entry *ce)
        return 1;
 }
 
+#if DBRT_DEBUG
+static void show_stage_entry(FILE *o,
+                            const char *label, const struct cache_entry *ce)
+{
+       fprintf(stderr, "%s%06o %s %d\t%s\n",
+               label,
+               ntohl(ce->ce_mode),
+               sha1_to_hex(ce->sha1),
+               ce_stage(ce),
+               ce->name);
+}
+#endif
+
 static int threeway_merge(struct cache_entry **stages)
 {
        struct cache_entry *index;
@@ -392,10 +405,10 @@ static int threeway_merge(struct cache_entry **stages)
        if (!same(remote, head)) {
                for (i = 1; i < head_idx; i++) {
                        if (same(stages[i], head)) {
-                               head_match = 1;
+                               head_match = i;
                        }
                        if (same(stages[i], remote)) {
-                               remote_match = 1;
+                               remote_match = i;
                        }
                }
        }
@@ -450,6 +463,13 @@ static int threeway_merge(struct cache_entry **stages)
                        }
                }
        }
+#if DBRT_DEBUG
+       else {
+               fprintf(stderr, "read-tree: warning #16 detected\n");
+               show_stage_entry(stderr, "head   ", stages[head_match]);
+               show_stage_entry(stderr, "remote ", stages[remote_match]);
+       }
+#endif
        if (head) { count += keep_entry(head); }
        if (remote) { count += keep_entry(remote); }
        return count;

diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index f1cd50cee9a43fffb173db8190698a25637fd2a5..c387e9ea08483ef9cc9fb3a61790eaa544c4973b 100755 (executable)
--- 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