projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document git aliases support
[git.git]
/
diffcore.h
diff --git
a/diffcore.h
b/diffcore.h
index
91d6c63
..
73c7842
100644
(file)
--- a/
diffcore.h
+++ b/
diffcore.h
@@
-17,8
+17,8
@@
*/
#define MAX_SCORE 60000.0
#define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
*/
#define MAX_SCORE 60000.0
#define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
-#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/
-#define DEFAULT_MERGE_SCORE
45000 /* maximum for break-merge to happen (75%)
*/
+#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)
*/
+#define DEFAULT_MERGE_SCORE
36000 /* maximum for break-merge to happen 60%)
*/
#define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */
#define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */
@@
-26,6
+26,7
@@
struct diff_filespec {
unsigned char sha1[20];
char *path;
void *data;
unsigned char sha1[20];
char *path;
void *data;
+ void *cnt_data;
unsigned long size;
int xfrm_flags; /* for use by the xfrm */
unsigned short mode; /* file mode */
unsigned long size;
int xfrm_flags; /* for use by the xfrm */
unsigned short mode; /* file mode */
@@
-101,4
+102,12
@@
void diff_debug_queue(const char *, struct diff_queue_struct *);
#define diff_debug_queue(a,b) do {} while(0)
#endif
#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,
+ void **src_count_p,
+ void **dst_count_p,
+ unsigned long delta_limit,
+ unsigned long *src_copied,
+ unsigned long *literal_added);
+
#endif
#endif