summaryrefslogtreecommitdiff
path: root/diffcore-break.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-14 14:06:50 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-14 14:06:50 -0700
commit19397b4521bcc27eb224413fb71519223b94290f (patch)
tree457823789014c2986aee9379f936d7025b54dad1 /diffcore-break.c
parent705a7148ba1bb9597b1837b7f64a0dcb67f1ad0c (diff)
downloadgit-19397b4521bcc27eb224413fb71519223b94290f.tar.gz
Revert "[PATCH] plug memory leak in diff.c::diff_free_filepair()"
This reverts 068eac91ce04b9aca163acb1927c3878c45d1a07 commit.
Diffstat (limited to 'diffcore-break.c')
-rw-r--r--diffcore-break.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-break.c b/diffcore-break.c
index b0c8461e12..06f9a7f0ee 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -231,8 +231,8 @@ static void merge_broken(struct diff_filepair *p,
dp = diff_queue(outq, d->one, c->two);
dp->score = p->score;
- diff_free_filespec(d->two);
- diff_free_filespec(c->one);
+ diff_free_filespec_data(d->two);
+ diff_free_filespec_data(c->one);
free(d);
free(c);
}