projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add git-show reference
[git.git]
/
diffcore.h
diff --git
a/diffcore.h
b/diffcore.h
index
f1b5ca7
..
dba4f17
100644
(file)
--- a/
diffcore.h
+++ b/
diffcore.h
@@
-15,7
+15,7
@@
* passed around in one int (high 16-bit for merge and low 16-bit
* for break).
*/
* passed around in one int (high 16-bit for merge and low 16-bit
* for break).
*/
-#define MAX_SCORE 60000
+#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 48000 /* maximum for break-merge to happen (80%)*/
#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 48000 /* maximum for break-merge to happen (80%)*/
@@
-85,7
+85,7
@@
extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
extern void diffcore_pathspec(const char **pathspec);
extern void diffcore_break(int);
extern void diffcore_pathspec(const char **pathspec);
extern void diffcore_break(int);
-extern void diffcore_rename(
int rename_copy, int
);
+extern void diffcore_rename(
struct diff_options *
);
extern void diffcore_merge_broken(void);
extern void diffcore_pickaxe(const char *needle, int opts);
extern void diffcore_order(const char *orderfile);
extern void diffcore_merge_broken(void);
extern void diffcore_pickaxe(const char *needle, int opts);
extern void diffcore_order(const char *orderfile);
@@
-101,4
+101,10
@@
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,
+ unsigned long delta_limit,
+ unsigned long *src_copied,
+ unsigned long *literal_added);
+
#endif
#endif