grep: run setup_git_directory_gently() sooner

diff --git a/diffcore.h b/diffcore.h
index 5d05deaf68b7c44a98456e9c0e12a7af2230f116..fed9b151b5b7818b0f211787e11b61b784ec9ade 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -18,7 +18,7 @@
 #define MAX_SCORE 60000.0
 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
 #define DEFAULT_BREAK_SCORE  30000 /* minimum for break to happen (50%) */
-#define DEFAULT_MERGE_SCORE  36000 /* maximum for break-merge to happen 60%) */
+#define DEFAULT_MERGE_SCORE  36000 /* maximum for break-merge to happen (60%) */
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
@@ -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;