Merge branch 'maint-1.6.6' into maint

gitster · gitster · commit b599672316ae · 2010-02-14T18:59:14.000-08:00
* maint-1.6.6:
  fix minor memory leak in get_tree_entry()
diff --git a/tree-walk.c b/tree-walk.c
@@ -441,6 +441,7 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
 
 	if (name[0] == '\0') {
 		hashcpy(sha1, root);
+		free(tree);
 		return 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,7 @@ int get_tree_entry(const unsigned char tree_sha1, const char name, unsigned ch`
`441`	`441`
`442`	`442`	`if (name[0] == '\0') {`
`443`	`443`	`hashcpy(sha1, root);`
	`444`	`+ free(tree);`
`444`	`445`	`return 0;`
`445`	`446`	`}`
`446`	`447`