Merge branch 'so/cvsserver-update'

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 63ac998bfaf64da807bec0ae0bd57c391fb651fe..d6fd3cacd6de4757994c61903dd07e0c4d74a9e9 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -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++;
        }