X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-break.c;h=06f9a7f0ee25891ff6f4dd9646e39cd4c8b105fd;hb=87a81c834bf48f8cbf8778cae78ed553f3bbd32c;hp=8cbb99fb41bd7a22028757e0e57842365c52622e;hpb=eeaa4603147974b988d7b958571628d6ecd697f3;p=git.git

diff --git a/diffcore-break.c b/diffcore-break.c
index 8cbb99fb..06f9a7f0 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -61,18 +61,11 @@ static int should_break(struct diff_filespec *src,
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
 		return 0; /* error but caught downstream */
 
-	delta_size = ((src->size < dst->size) ?
-		      (dst->size - src->size) : (src->size - dst->size));
-
-	/* Notice that we use max of src and dst as the base size,
-	 * unlike rename similarity detection.  This is so that we do
-	 * not mistake a large addition as a complete rewrite.
-	 */
-	base_size = ((src->size < dst->size) ? dst->size : src->size);
+	base_size = ((src->size < dst->size) ? src->size : dst->size);
 
 	delta = diff_delta(src->data, src->size,
 			   dst->data, dst->size,
-			   &delta_size);
+			   &delta_size, 0);
 
 	/* Estimate the edit size by interpreting delta. */
 	if (count_delta(delta, delta_size,
@@ -88,10 +81,11 @@ static int should_break(struct diff_filespec *src,
 	 * less than the minimum, after rename/copy runs.
 	 */
 	if (src->size <= src_copied)
-		delta_size = 0; /* avoid wrapping around */
-	else
+		; /* all copied, nothing removed */
+	else {
 		delta_size = src->size - src_copied;
-	*merge_score_p = delta_size * MAX_SCORE / src->size;
+		*merge_score_p = delta_size * MAX_SCORE / src->size;
+	}
 	
 	/* Extent of damage, which counts both inserts and
 	 * deletes.
@@ -174,7 +168,8 @@ void diffcore_break(int break_score)
 		    !S_ISDIR(p->one->mode) && !S_ISDIR(p->two->mode) &&
 		    !strcmp(p->one->path, p->two->path)) {
 			if (should_break(p->one, p->two,
-					 break_score, &score)) {
+					 break_score, &score) &&
+			    MINIMUM_BREAK_SIZE <= p->one->size) {
 				/* Split this into delete and create */
 				struct diff_filespec *null_one, *null_two;
 				struct diff_filepair *dp;
@@ -185,8 +180,7 @@ void diffcore_break(int break_score)
 				 * Also we do not want to break very
 				 * small files.
 				 */
-				if ((score < merge_score) ||
-				    (p->one->size < MINIMUM_BREAK_SIZE))
+				if (score < merge_score)
 					score = 0;
 
 				/* deletion of one */
@@ -220,7 +214,7 @@ static void merge_broken(struct diff_filepair *p,
 			 struct diff_queue_struct *outq)
 {
 	/* p and pp are broken pairs we want to merge */
-	struct diff_filepair *c = p, *d = pp;
+	struct diff_filepair *c = p, *d = pp, *dp;
 	if (DIFF_FILE_VALID(p->one)) {
 		/* this must be a delete half */
 		d = p; c = pp;
@@ -235,7 +229,8 @@ static void merge_broken(struct diff_filepair *p,
 	if (!DIFF_FILE_VALID(c->two))
 		die("internal error in merge #4");
 
-	diff_queue(outq, d->one, c->two);
+	dp = diff_queue(outq, d->one, c->two);
+	dp->score = p->score;
 	diff_free_filespec_data(d->two);
 	diff_free_filespec_data(c->one);
 	free(d);
@@ -257,7 +252,6 @@ void diffcore_merge_broken(void)
 			/* we already merged this with its peer */
 			continue;
 		else if (p->broken_pair &&
-			 p->score == 0 &&
 			 !strcmp(p->one->path, p->two->path)) {
 			/* If the peer also survived rename/copy, then
 			 * we merge them back together.
@@ -265,7 +259,6 @@ void diffcore_merge_broken(void)
 			for (j = i + 1; j < q->nr; j++) {
 				struct diff_filepair *pp = q->queue[j];
 				if (pp->broken_pair &&
-				    p->score == 0 &&
 				    !strcmp(pp->one->path, pp->two->path) &&
 				    !strcmp(p->one->path, pp->two->path)) {
 					/* Peer survived.  Merge them */