kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[PATCH] Disable debugging from read-tree. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2005-09-05 01:13:36 -07:00
parent 3d89cb4f3f
commit 2ab706a38f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
read-tree.c
View File

@ -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, static int unpack_trees_rec(struct tree_entry_list **posns, int len,
const char *base, merge_fn_t fn, int *indpos) 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) if (first)
printf("index %s\n", first); printf("index %s\n", first);

#endif
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (!posns[i] || posns[i] == &df_conflict_list) if (!posns[i] || posns[i] == &df_conflict_list)
continue; 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, if (!first || entcmp(first, firstdir,
posns[i]->name, posns[i]->name,
posns[i]->directory) > 0) { posns[i]->directory) > 0) {
@ -183,6 +188,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
if (merge) { if (merge) {
int ret; int ret;


#if DBRT_DEBUG
printf("%s:\n", first); printf("%s:\n", first);
for (i = 0; i < src_size; i++) { for (i = 0; i < src_size; i++) {
printf(" %d ", i); printf(" %d ", i);
@ -191,11 +197,12 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
else else
printf("\n"); 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; *indpos += ret;
} else { } else {
for (i = 0; i < src_size; i++) { for (i = 0; i < src_size; i++) {