Skip to content

Commit

Permalink
log: drop unused rev_info from early output
Browse files Browse the repository at this point in the history
The early output code passes around a rev_info struct but doesn't need
it. The setup step only turns on global signal handlers, and the
"estimate" step is done completely from the rev->commits list that is
passed in separately.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
peff authored and gitster committed Mar 20, 2019
1 parent 9163399 commit 7954d36
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions builtin/log.c
Expand Up @@ -251,7 +251,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
* This gives a rough estimate for how many commits we
* will print out in the list.
*/
static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
static int estimate_commit_count(struct commit_list *list)
{
int n = 0;

Expand Down Expand Up @@ -289,7 +289,7 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
switch (simplify_commit(revs, commit)) {
case commit_show:
if (show_header) {
int n = estimate_commit_count(revs, list);
int n = estimate_commit_count(list);
show_early_header(revs, "incomplete", n);
show_header = 0;
}
Expand Down Expand Up @@ -333,7 +333,7 @@ static void early_output(int signal)
show_early_output = log_show_early;
}

static void setup_early_output(struct rev_info *rev)
static void setup_early_output(void)
{
struct sigaction sa;

Expand Down Expand Up @@ -364,7 +364,7 @@ static void setup_early_output(struct rev_info *rev)

static void finish_early_output(struct rev_info *rev)
{
int n = estimate_commit_count(rev, rev->commits);
int n = estimate_commit_count(rev->commits);
signal(SIGALRM, SIG_IGN);
show_early_header(rev, "done", n);
}
Expand All @@ -376,7 +376,7 @@ static int cmd_log_walk(struct rev_info *rev)
int saved_dcctc = 0, close_file = rev->diffopt.close_file;

if (rev->early_output)
setup_early_output(rev);
setup_early_output();

if (prepare_revision_walk(rev))
die(_("revision walk setup failed"));
Expand Down

0 comments on commit 7954d36

Please sign in to comment.