Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
read_gitfile_gently(): rename misnamed function to read_gitfile()
[gitweb.git]
/
builtin
/
diff.c
diff --git
a/builtin/diff.c
b/builtin/diff.c
index 14bd14fce0fa6b9c9b047142d23d4a2237b57a36..69cd5eed78cb402839813e7eca65b5598afa4a90 100644
(file)
--- a/
builtin/diff.c
+++ b/
builtin/diff.c
@@
-182,6
+182,7
@@
static int builtin_diff_combined(struct rev_info *revs,
hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
diff_tree_combined(parent[0], parent + 1, ents - 1,
revs->dense_combined_merges, revs);
+ free(parent);
return 0;
}