Simplify common default options setup for built-in log family.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 16, 2006 at 02:42 UTC
d4ed9793fd981ea5a35ebaa8e337446bb29f6d55
1 file changed
+7
-13
git.c
+7
-13
@@ -286,6 +286,11 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
286
const char *commit_prefix = "commit ";
287
int shown = 0;
288
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
+
294
if (argc > 1)
295
die("unrecognized argument: %s", argv[1]);
296
if (rev->commit_format == CMIT_FMT_ONELINE)
@@ -347,12 +352,8 @@ static int cmd_wc(int argc, const char **argv, char **envp)
352
struct rev_info rev;
353
354
init_revisions(&rev);
350
- rev.abbrev = DEFAULT_ABBREV;
351
- rev.no_commit_id = 1;
352
- rev.commit_format = CMIT_FMT_DEFAULT;
355
rev.diff = 1;
356
rev.diffopt.recursive = 1;
355
- argc = setup_revisions(argc, argv, &rev, "HEAD");
357
return cmd_log_wc(argc, argv, envp, &rev);
358
}
359
@@ -362,14 +363,11 @@ static int cmd_show(int argc, const char **argv, char **envp)
363
364
init_revisions(&rev);
365
rev.diff = 1;
365
- rev.ignore_merges = 0;
366
+ rev.diffopt.recursive = 1;
367
rev.combine_merges = 1;
368
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;
370
rev.no_walk = 1;
372
- argc = setup_revisions(argc, argv, &rev, "HEAD");
371
return cmd_log_wc(argc, argv, envp, &rev);
372
}
373
@@ -378,10 +376,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
376
struct rev_info rev;
377
378
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");
379
return cmd_log_wc(argc, argv, envp, &rev);
380
}
381