Skip to content

Commit 24a9d25

Browse files
committed
diffcore-break: allow debugging
Sprinkle a few diff_debug_queue() to allow inspecting what is going on inside this part of the diffcore chain. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 817d03e commit 24a9d25

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

diffcore-break.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ void diffcore_break(int break_score)
167167

168168
DIFF_QUEUE_CLEAR(&outq);
169169

170+
diff_debug_queue("begin breaking", q);
170171
for (i = 0; i < q->nr; i++) {
171172
struct diff_filepair *p = q->queue[i];
172173
int score;
@@ -221,6 +222,7 @@ void diffcore_break(int break_score)
221222
free(q->queue);
222223
*q = outq;
223224

225+
diff_debug_queue("end breaking", q);
224226
return;
225227
}
226228

@@ -267,6 +269,7 @@ void diffcore_merge_broken(void)
267269

268270
DIFF_QUEUE_CLEAR(&outq);
269271

272+
diff_debug_queue("begin merge broken", q);
270273
for (i = 0; i < q->nr; i++) {
271274
struct diff_filepair *p = q->queue[i];
272275
if (!p)
@@ -299,6 +302,7 @@ void diffcore_merge_broken(void)
299302
}
300303
free(q->queue);
301304
*q = outq;
305+
diff_debug_queue("end merge broken", q);
302306

303307
return;
304308
}

0 commit comments

Comments
 (0)