diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:25 -0700 |
| commit | 2f91bcfa9d8d1f443012e3e92092f464f3bb3557 (patch) | |
| tree | 1813dc04efc420f0ece0b29481628d22831dd258 /diffcore.h | |
| parent | ca6c06b2efe2f55c498670efcb419bce35678e03 (diff) | |
| parent | 9cb92c390cefd3bf3f71bbda12eb04893c861361 (diff) | |
| download | git-2f91bcfa9d8d1f443012e3e92092f464f3bb3557.tar.gz | |
Merge branch 'jk/diff-convfilter'
* jk/diff-convfilter:
diff: add filter for converting binary to text
diff: introduce diff.<driver>.binary
diff: unify external diff and funcname parsing code
t4012: use test_cmp instead of cmp
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h index 8ae35785fd..713cca785c 100644 --- a/diffcore.h +++ b/diffcore.h @@ -22,6 +22,8 @@ #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */ +struct userdiff_driver; + struct diff_filespec { unsigned char sha1[20]; char *path; @@ -40,8 +42,10 @@ 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 checked_attr : 1; - unsigned is_binary : 1; /* data should be considered "binary" */ + + struct userdiff_driver *driver; + /* data should be considered "binary"; -1 means "don't know yet" */ + int is_binary; }; extern struct diff_filespec *alloc_filespec(const char *); |