diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:23 -0700 |
| commit | 82c531b3b6d24040443ba739e150bc06ecc762ea (patch) | |
| tree | de6a17434e48ee7866941e2e5491d9cf4d9b96e1 /diffcore.h | |
| parent | 82e7ee7351d6e328294016d3b99825d8001abd24 (diff) | |
| parent | 9feeaa2bf39aed4a0148296f504f88b09b8901d4 (diff) | |
| download | git-82c531b3b6d24040443ba739e150bc06ecc762ea.tar.gz git-82c531b3b6d24040443ba739e150bc06ecc762ea.tar.xz | |
Merge branch 'by/log-follow'
* by/log-follow:
tests: rename duplicate t4205
Make git log --follow find copies among unmodified files.
Make diffcore_std only can run once before a diff_flush
Add a macro DIFF_QUEUE_CLEAR.
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index fcd00bf27..491bea0b4 100644 --- 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 *, |