From cd9519bd2c5c666cfb3ec219ee0b47c83f26f3fe Mon Sep 17 00:00:00 2001 From: Liu Yuan Date: Thu, 10 Nov 2011 16:39:22 +0800 Subject: [PATCH 1/2] mktree: fix a memory leak in write_tree() We forget to call strbuf_release to release the buf memory. Signed-off-by: Liu Yuan Signed-off-by: Junio C Hamano --- mktree.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mktree.c b/mktree.c index 2e84889c02..bb23c4425b 100644 --- a/mktree.c +++ b/mktree.c @@ -61,6 +61,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[] = "git-mktree [-z]"; From bc1bbe0c19a6ff39522b4fa3259f34150e308e1f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 12 Nov 2011 22:14:53 -0800 Subject: [PATCH 2/2] Git 1.7.8-rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.txt | 2 +- GIT-VERSION-GEN | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt index 7626fee8eb..b9bb32492f 100644 --- a/Documentation/RelNotes/1.7.8.txt +++ b/Documentation/RelNotes/1.7.8.txt @@ -165,7 +165,7 @@ included in this release. --- exec >/var/tmp/1 -O=v1.7.8-rc1-11-gd7a0129 +O=v1.7.8-rc1-23-gdc865af echo O=$(git describe --always master) git log --first-parent --oneline --reverse ^$O master echo diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index cc8a3d27d5..c3435b0c4f 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.8-rc1 +DEF_VER=v1.7.8-rc2 LF=' '