зеркало из https://github.com/microsoft/git.git
[PATCH] Do not expose internal scaling to diff-helper.
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:
Родитель
1a0756ffe4
Коммит
903d475a0b
|
@ -4,7 +4,6 @@
|
|||
#include "cache.h"
|
||||
#include "strbuf.h"
|
||||
#include "diff.h"
|
||||
#include "diffcore.h" /* just for MAX_SCORE */
|
||||
|
||||
static const char *pickaxe = NULL;
|
||||
static int line_termination = '\n';
|
||||
|
@ -78,7 +77,6 @@ int main(int ac, const char **av) {
|
|||
if (status == 'R' || status == 'C') {
|
||||
two_paths = 1;
|
||||
sscanf(cp, "%d", &score);
|
||||
score = score * MAX_SCORE / 100;
|
||||
if (line_termination) {
|
||||
cp = strchr(cp,
|
||||
inter_name_termination);
|
||||
|
|
2
diff.c
2
diff.c
|
@ -886,7 +886,7 @@ void diff_helper_input(unsigned old_mode,
|
|||
if (new_mode)
|
||||
fill_filespec(two, new_sha1, new_mode);
|
||||
dp = diff_queue(&diff_queued_diff, one, two);
|
||||
dp->score = score;
|
||||
dp->score = score * MAX_SCORE / 100;
|
||||
dp->status = status;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче