Merge branch 'master' into next

* master:
  Git 1.7.8-rc2
  mktree: fix a memory leak in write_tree()
This commit is contained in:
Junio C Hamano
2011-11-12 22:15:28 -08:00
3 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v1.7.8-rc1
DEF_VER=v1.7.8-rc2
LF='
'

View File

@@ -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[] = {