diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-20 12:53:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 12:53:09 -0700 |
| commit | 55c6e6dc38188d27b4ec0315db93d6c40725cdd6 (patch) | |
| tree | ede040677f6ad505638458f178d9527600ee7b4e /diffcore.h | |
| parent | 16bfbe6352e90b87de26effe5ce120ab74ebafc7 (diff) | |
| parent | 65113121a50cd765033d51204213c817832c59cf (diff) | |
| download | git-55c6e6dc38188d27b4ec0315db93d6c40725cdd6.tar.gz git-55c6e6dc38188d27b4ec0315db93d6c40725cdd6.tar.xz | |
Merge branch 'jc/maint-follow-rename-fix' into maint
* jc/maint-follow-rename-fix:
log: test for regression introduced in v1.7.2-rc0~103^2~2
diff --follow: do call diffcore_std() as necessary
diff --follow: do not waste cycles while recursing
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h index 05ebc115a..8b3241ad1 100644 --- a/diffcore.h +++ b/diffcore.h @@ -91,13 +91,11 @@ 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; |