diff --git a/builtin-log.c b/builtin-log.c
index c8c620827587f14c4ff3314572c0dd01a4a4cfe3..44f9a27daec612db6d0f0e502c99d5e5ecaaf842 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
printf("Final output: %d %s\n", nr, stage);
}
-struct itimerval early_output_timer;
+static struct itimerval early_output_timer;
static void log_show_early(struct rev_info *revs, struct commit_list *list)
{
* like "git format-patch -o a123 HEAD^.." may fail; a123 is
* possibly a valid SHA1.
*/
- argc = parse_options(argc, argv, builtin_format_patch_options,
+ argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
builtin_format_patch_usage,
PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN);
strbuf_addch(&buf, '\n');
}
- rev.extra_headers = strbuf_detach(&buf, 0);
+ rev.extra_headers = strbuf_detach(&buf, NULL);
if (start_number < 0)
start_number = 1;