[PATCH] Disable debugging from read-tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/read-tree.c b/read-tree.c
index 0241c9c6f55c2345d5604ddbb93baee53d11ea9a..fed2a3c544c0090d04175042fe5999d9c86bc1a9 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -47,6 +47,8 @@ static int entcmp(char *name1, int dir1, char *name2, int dir2)
        return ret;
 }
 
        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)
 {
 static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                            const char *base, merge_fn_t fn, int *indpos)
 {


@@ -99,13 +101,16 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        }
                }
 
                        }
                }
 

+#if DBRT_DEBUG

                if (first)
                        printf("index %s\n", first);
                if (first)
                        printf("index %s\n", first);

-
+#endif

                for (i = 0; i < len; i++) {
                        if (!posns[i] || posns[i] == &df_conflict_list)
                                continue;
                for (i = 0; i < len; i++) {
                        if (!posns[i] || posns[i] == &df_conflict_list)
                                continue;

+#if DBRT_DEBUG

                        printf("%d %s\n", i + 1, posns[i]->name);
                        printf("%d %s\n", i + 1, posns[i]->name);

+#endif

                        if (!first || entcmp(first, firstdir,
                                             posns[i]->name, 
                                             posns[i]->directory) > 0) {
                        if (!first || entcmp(first, firstdir,
                                             posns[i]->name, 
                                             posns[i]->directory) > 0) {


@@ -183,6 +188,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        if (merge) {
                                int ret;
 
                        if (merge) {
                                int ret;
 

+#if DBRT_DEBUG

                                printf("%s:\n", first);
                                for (i = 0; i < src_size; i++) {
                                        printf(" %d ", i);
                                printf("%s:\n", first);
                                for (i = 0; i < src_size; i++) {
                                        printf(" %d ", i);


@@ -191,11 +197,12 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                                        else
                                                printf("\n");
                                }
                                        else
                                                printf("\n");
                                }

-
+#endif

                                ret = fn(src);
                                
                                ret = fn(src);
                                

+#if DBRT_DEBUG

                                printf("Added %d entries\n", ret);
                                printf("Added %d entries\n", ret);

-
+#endif

                                *indpos += ret;
                        } else {
                                for (i = 0; i < src_size; i++) {
                                *indpos += ret;
                        } else {
                                for (i = 0; i < src_size; i++) {