Merge branch 'ly/mktree-using-strbuf'

gitster · gitster · commit dc865af65f2f · 2011-11-11T21:34:06.000-08:00
* ly/mktree-using-strbuf:
  mktree: fix a memory leak in write_tree()
diff --git a/builtin/mktree.c b/builtin/mktree.c
@@ -60,6 +60,7 @@ static void write_tree(unsigned char *sha1)
 	}
 
 	write_sha1_file(buf.buf, buf.len, tree_type, sha1);
+	strbuf_release(&buf);
 }
 
 static const char *mktree_usage[] = {

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ static void write_tree(unsigned char *sha1)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`write_sha1_file(buf.buf, buf.len, tree_type, sha1);`
	`63`	`+ strbuf_release(&buf);`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`static const char *mktree_usage[] = {`