cmd_fetch_pack(): return early if finish_connect() fails

diff --git a/builtin/mktree.c b/builtin/mktree.c
index 098395fda1932674e29f8d2cb332c722a6cb275f..f92ba404abd5cea0cde344936f697e46c1a46045 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -60,10 +60,11 @@ 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] [--missing] [--batch]",
+       N_("git mktree [-z] [--missing] [--batch]"),
        NULL
 };
 
@@ -149,9 +150,9 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
        int got_eof = 0;
 
        const struct option option[] = {
-               OPT_SET_INT('z', NULL, &line_termination, "input is NUL terminated", '\0'),
-               OPT_SET_INT( 0 , "missing", &allow_missing, "allow missing objects", 1),
-               OPT_SET_INT( 0 , "batch", &is_batch_mode, "allow creation of more than one tree", 1),
+               OPT_SET_INT('z', NULL, &line_termination, N_("input is NUL terminated"), '\0'),
+               OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
+               OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
                OPT_END()
        };