X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=diffcore-rename.c;h=794e5cc7d5d984f49d65f93348199724ec753af9;hb=c1bb93502012b710ec5a31dff62d4aca7bf51adc;hp=8de80dfe73ef01f9529b0a9d2fb234b6cb9849ba;hpb=26dee0adfcfa6fc15a522d32765eabbe4f295237;p=git.git diff --git a/diffcore-rename.c b/diffcore-rename.c index 8de80dfe..794e5cc7 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -224,8 +224,25 @@ static int needs_to_stay(struct diff_queue_struct *q, int i, return 0; } -void diff_detect_rename(int detect_rename, - int minimum_score) +int diff_scoreopt_parse(const char *opt) +{ + int diglen, num, scale, i; + if (opt[0] != '-' || (opt[1] != 'M' && opt[1] != 'C')) + return -1; /* that is not a -M nor -C option */ + diglen = strspn(opt+2, "0123456789"); + if (diglen == 0 || strlen(opt+2) != diglen) + return 0; /* use default */ + sscanf(opt+2, "%d", &num); + for (i = 0, scale = 1; i < diglen; i++) + scale *= 10; + + /* user says num divided by scale and we say internally that + * is MAX_SCORE * num / scale. + */ + return MAX_SCORE * num / scale; +} + +void diffcore_rename(int detect_rename, int minimum_score) { struct diff_queue_struct *q = &diff_queued_diff; struct diff_queue_struct outq;