make --max-pack-size argument to 'git pack-object' count in bytes

diff --git a/builtin-grep.c b/builtin-grep.c
index 6cc743d7c585fa443f18a700455a4da662dec49f..0ef849cb84650705ffc840aed8a3fcedbeb48f9a 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -205,6 +205,8 @@ static void *run(void *arg)
 
                work_done(w);
        }
+       free_grep_patterns(arg);
+       free(arg);
 
        return (void*) (intptr_t) hit;
 }
@@ -832,7 +834,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                { OPTION_CALLBACK, ')', NULL, &opt, NULL, "",
                  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
                  close_callback },
-               OPT_BOOLEAN('q', "quick", &opt.status_only,
+               OPT_BOOLEAN('q', "quiet", &opt.status_only,
                            "indicate hit with exit status without output"),
                OPT_BOOLEAN(0, "all-match", &opt.all_match,
                        "show only matches from files that match all patterns"),