Merge branch 'maint'

diff --git a/mktree.c b/mktree.c
index e0da110a98d3a7376dc78df71fabc10fc5664296..514fd9b15a6680389bf2c1274d29c55d2c1034f7 100644 (file)
--- a/mktree.c
+++ b/mktree.c
@@ -65,8 +65,8 @@ static const char mktree_usage[] = "git-mktree [-z]";
 
 int main(int ac, char **av)
 {
-       struct strbuf sb;
-       struct strbuf p_uq;
+       struct strbuf sb = STRBUF_INIT;
+       struct strbuf p_uq = STRBUF_INIT;
        unsigned char sha1[20];
        int line_termination = '\n';
 
@@ -82,8 +82,6 @@ int main(int ac, char **av)
                av++;
        }
 
-       strbuf_init(&sb, 0);
-       strbuf_init(&p_uq, 0);
        while (strbuf_getline(&sb, stdin, line_termination) != EOF) {
                char *ptr, *ntr;
                unsigned mode;