diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:12 -0700 |
| commit | e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307 (patch) | |
| tree | e0611ad20c9a515a0bd4378749e9b3cac41560e3 /diffcore.h | |
| parent | 792d2370f975f032a708cb35044193b5b5310840 (diff) | |
| parent | b9905fed7a028cc9749cf8ad479cbb07940c8638 (diff) | |
| download | git-e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307.tar.gz git-e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307.tar.xz | |
Merge branch 'jc/diffcore'
* jc/diffcore:
diffcore-delta.c: Ignore CR in CRLF for text files
diffcore-delta.c: update the comment on the algorithm.
diffcore_filespec: add is_binary
diffcore_count_changes: pass diffcore_filespec
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h index 7b9294eab..0c8abb5b9 100644 --- a/diffcore.h +++ b/diffcore.h @@ -37,6 +37,7 @@ struct diff_filespec { #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0) unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ + unsigned is_binary : 1; /* data should be considered "binary" */ }; extern struct diff_filespec *alloc_filespec(const char *); @@ -103,8 +104,8 @@ void diff_debug_queue(const char *, struct diff_queue_struct *); #define diff_debug_queue(a,b) do {} while(0) #endif -extern int diffcore_count_changes(void *src, unsigned long src_size, - void *dst, unsigned long dst_size, +extern int diffcore_count_changes(struct diff_filespec *src, + struct diff_filespec *dst, void **src_count_p, void **dst_count_p, unsigned long delta_limit, |