Skip to content

Commit d4ed979

Browse files
author
Junio C Hamano
committed
Simplify common default options setup for built-in log family.
Signed-off-by: Junio C Hamano <[email protected]>
1 parent b293492 commit d4ed979

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

git.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
286286
const char *commit_prefix = "commit ";
287287
int shown = 0;
288288

289+
rev->abbrev = DEFAULT_ABBREV;
290+
rev->commit_format = CMIT_FMT_DEFAULT;
291+
rev->no_commit_id = 1;
292+
argc = setup_revisions(argc, argv, rev, "HEAD");
293+
289294
if (argc > 1)
290295
die("unrecognized argument: %s", argv[1]);
291296
if (rev->commit_format == CMIT_FMT_ONELINE)
@@ -347,12 +352,8 @@ static int cmd_wc(int argc, const char **argv, char **envp)
347352
struct rev_info rev;
348353

349354
init_revisions(&rev);
350-
rev.abbrev = DEFAULT_ABBREV;
351-
rev.no_commit_id = 1;
352-
rev.commit_format = CMIT_FMT_DEFAULT;
353355
rev.diff = 1;
354356
rev.diffopt.recursive = 1;
355-
argc = setup_revisions(argc, argv, &rev, "HEAD");
356357
return cmd_log_wc(argc, argv, envp, &rev);
357358
}
358359

@@ -362,14 +363,11 @@ static int cmd_show(int argc, const char **argv, char **envp)
362363

363364
init_revisions(&rev);
364365
rev.diff = 1;
365-
rev.ignore_merges = 0;
366+
rev.diffopt.recursive = 1;
366367
rev.combine_merges = 1;
367368
rev.dense_combined_merges = 1;
368-
rev.abbrev = DEFAULT_ABBREV;
369-
rev.commit_format = CMIT_FMT_DEFAULT;
370-
rev.diffopt.recursive = 1;
369+
rev.ignore_merges = 0;
371370
rev.no_walk = 1;
372-
argc = setup_revisions(argc, argv, &rev, "HEAD");
373371
return cmd_log_wc(argc, argv, envp, &rev);
374372
}
375373

@@ -378,10 +376,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
378376
struct rev_info rev;
379377

380378
init_revisions(&rev);
381-
rev.abbrev = DEFAULT_ABBREV;
382-
rev.no_commit_id = 1;
383-
rev.commit_format = CMIT_FMT_DEFAULT;
384-
argc = setup_revisions(argc, argv, &rev, "HEAD");
385379
return cmd_log_wc(argc, argv, envp, &rev);
386380
}
387381

0 commit comments

Comments
 (0)