revert: refactor code into a do_pick_commit() function

diff --git a/diffcore.h b/diffcore.h
index 5d05deaf68b7c44a98456e9c0e12a7af2230f116..491bea0b44963461cfce30b07ec96a9005a3c910 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -91,11 +91,13 @@ 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;