summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-03 03:03:15 -0700
committerJunio C Hamano <gitster@pobox.com>2007-10-03 03:03:15 -0700
commitfed276e7524d6a80ae5dec037d586bd28543fc79 (patch)
tree979ede5142a918b8d0de5249789f697389e3d0b8 /diff.c
parent34c6dbdef439f7cd93d3fe22493a3c1496ce96f7 (diff)
parent4c75136f7697f76b31641db775163f5c75906ee2 (diff)
downloadgit-fed276e7524d6a80ae5dec037d586bd28543fc79.tar.gz
Sync with GIT 1.5.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 35e3c61986..71b340c536 100644
--- a/diff.c
+++ b/diff.c
@@ -1675,7 +1675,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
return 0;
}
-void diff_free_filespec_data_large(struct diff_filespec *s)
+void diff_free_filespec_blob(struct diff_filespec *s)
{
if (s->should_free)
free(s->data);
@@ -1690,7 +1690,7 @@ void diff_free_filespec_data_large(struct diff_filespec *s)
void diff_free_filespec_data(struct diff_filespec *s)
{
- diff_free_filespec_data_large(s);
+ diff_free_filespec_blob(s);
free(s->cnt_data);
s->cnt_data = NULL;
}