X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diffcore.h;h=12cd816591aa112b5fe6a773cb5ba2acbf9cf96e;hb=38fd0721d0a2a1a723bc28fc0817e3571987b1ef;hp=194d40cb4823f294cce67c430fa57520d4bc7ce9;hpb=eeaa4603147974b988d7b958571628d6ecd697f3;p=git.git diff --git a/diffcore.h b/diffcore.h index 194d40cb..12cd8165 100644 --- a/diffcore.h +++ b/diffcore.h @@ -15,9 +15,9 @@ * 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 59400 /* minimum for break to happen (99%)*/ +#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/ #define DEFAULT_MERGE_SCORE 48000 /* maximum for break-merge to happen (80%)*/ #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */ @@ -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_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);