mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Do not expose internal scaling to diff-helper.

Browse Source 
Instead we can normalize what diff-raw records at the diffcore
side.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-05-27 15:53:31 -07:00
committed by Linus Torvalds
parent 1a0756ffe4
commit 903d475a0b
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff-helper.c
View File

@ -4,7 +4,6 @@
#include "cache.h" #include "cache.h"
#include "strbuf.h" #include "strbuf.h"
#include "diff.h" #include "diff.h"
#include "diffcore.h" /* just for MAX_SCORE */
static const char *pickaxe = NULL; static const char *pickaxe = NULL;
static int line_termination = '\n'; static int line_termination = '\n';
@ -78,7 +77,6 @@ int main(int ac, const char **av) {
if (status == 'R' || status == 'C') { if (status == 'R' || status == 'C') {
two_paths = 1; two_paths = 1;
sscanf(cp, "%d", &score); sscanf(cp, "%d", &score);
score = score * MAX_SCORE / 100;
if (line_termination) { if (line_termination) {
cp = strchr(cp, cp = strchr(cp,
inter_name_termination); inter_name_termination);

2
diff.c
View File

@ -886,7 +886,7 @@ void diff_helper_input(unsigned old_mode,
if (new_mode) if (new_mode)
fill_filespec(two, new_sha1, new_mode); fill_filespec(two, new_sha1, new_mode);
dp = diff_queue(&diff_queued_diff, one, two); dp = diff_queue(&diff_queued_diff, one, two);
dp->score = score; dp->score = score * MAX_SCORE / 100;
dp->status = status; dp->status = status;
} }