diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-22 21:04:37 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 21:17:50 +0400 |
| commit | 6b14d7faf0bad026a81a27bac07b47691f621b8f (patch) | |
| tree | b9d1923aaaea706179e9b27e07a843d277ad1bee /diffcore.h | |
| parent | 26dee0adfcfa6fc15a522d32765eabbe4f295237 (diff) | |
[PATCH] Diffcore updates.
This moves the path selection logic from individual programs to a new
diffcore transformer (diff-tree still needs to have its own for
performance reasons). Also the header printing code in diff-tree was
tweaked not to produce anything when pickaxe is in effect and there is
nothing interesting to report. An interesting example is the following
in the GIT archive itself:
$ git-whatchanged -p -C -S'or something in a real script'
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 5eca32afcc..d087e1758c 100644 --- a/diffcore.h +++ b/diffcore.h @@ -45,6 +45,8 @@ struct diff_filepair { int orig_order; /* the original order of insertion into the queue */ int xfrm_work; /* for use by tramsformers, not by diffcore */ }; +#define DIFF_PAIR_UNMERGED(p) \ + (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two)) struct diff_queue_struct { struct diff_filepair **queue; @@ -56,5 +58,7 @@ extern struct diff_queue_struct diff_queued_diff; extern struct diff_filepair *diff_queue(struct diff_queue_struct *, struct diff_filespec *, struct diff_filespec *); +extern void diff_q(struct diff_queue_struct *, struct diff_filepair *); +extern void diff_free_filepair(struct diff_filepair *); #endif |