Merge branch 'jc/apply-epoch-patch'

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index badd9120388569c79b137f679505b495cc1dbbe9..6a3812ee18a2ca1bc251f67582ebaee3675d9af5 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -101,7 +101,6 @@ static void insert_one_record(struct shortlog *log,
        }
        while (*oneline && isspace(*oneline) && *oneline != '\n')
                oneline++;
-       len = eol - oneline;
        format_subject(&subject, oneline, " ");
        buffer = strbuf_detach(&subject, NULL);
 
@@ -264,7 +263,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
        git_config(git_default_config, NULL);
        shortlog_init(&log);
        init_revisions(&rev, prefix);
-       parse_options_start(&ctx, argc, argv, PARSE_OPT_KEEP_DASHDASH |
+       parse_options_start(&ctx, argc, argv, prefix, PARSE_OPT_KEEP_DASHDASH |
                            PARSE_OPT_KEEP_ARGV0);
 
        for (;;) {