X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore-rename.c;h=d6fd3cacd6de4757994c61903dd07e0c4d74a9e9;hb=410e99fadf25b65b70d9bf90fd8bd5a5d1ea3c8a;hp=0b0d6b8c8c2ab8833bb5d929ef0d3cb7891ec582;hpb=0abd52772bcb82a7293bb1c2bd351fbe303abaf1;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 0b0d6b8c8..d6fd3cacd 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -267,7 +267,7 @@ static int find_identical_files(struct file_similarity *src,
 			int score;
 			struct diff_filespec *source = p->filespec;
 
-			/* False hash collission? */
+			/* False hash collision? */
 			if (hashcmp(source->sha1, target->sha1))
 				continue;
 			/* Non-regular files? If so, the modes must match! */
@@ -523,10 +523,13 @@ void diffcore_rename(struct diff_options *options)
 			this_src.dst = i;
 			this_src.src = j;
 			record_if_better(m, &this_src);
+			/*
+			 * Once we run estimate_similarity,
+			 * We do not need the text anymore.
+			 */
 			diff_free_filespec_blob(one);
+			diff_free_filespec_blob(two);
 		}
-		/* We do not need the text anymore */
-		diff_free_filespec_blob(two);
 		dst_cnt++;
 	}