Merge branch 'maint'

diff --git a/diffcore.h b/diffcore.h
index fcd00bf27aee4e1f2823f05ab3dba1d3c70a509d..491bea0b44963461cfce30b07ec96a9005a3c910 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -91,7 +91,14 @@ struct diff_queue_struct {
        struct diff_filepair **queue;
        int alloc;
        int nr;
+       int run;
 };
+#define DIFF_QUEUE_CLEAR(q) \
+       do { \
+               (q)->queue = NULL; \
+               (q)->nr = (q)->alloc = 0; \
+               (q)->run = 0; \
+       } while(0);
 
 extern struct diff_queue_struct diff_queued_diff;
 extern struct diff_filepair *diff_queue(struct diff_queue_struct *,