@@ -286,6 +286,11 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
286
286
const char * commit_prefix = "commit " ;
287
287
int shown = 0 ;
288
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
+
289
294
if (argc > 1 )
290
295
die ("unrecognized argument: %s" , argv [1 ]);
291
296
if (rev -> commit_format == CMIT_FMT_ONELINE )
@@ -347,12 +352,8 @@ static int cmd_wc(int argc, const char **argv, char **envp)
347
352
struct rev_info rev ;
348
353
349
354
init_revisions (& rev );
350
- rev .abbrev = DEFAULT_ABBREV ;
351
- rev .no_commit_id = 1 ;
352
- rev .commit_format = CMIT_FMT_DEFAULT ;
353
355
rev .diff = 1 ;
354
356
rev .diffopt .recursive = 1 ;
355
- argc = setup_revisions (argc , argv , & rev , "HEAD" );
356
357
return cmd_log_wc (argc , argv , envp , & rev );
357
358
}
358
359
@@ -362,14 +363,11 @@ static int cmd_show(int argc, const char **argv, char **envp)
362
363
363
364
init_revisions (& rev );
364
365
rev .diff = 1 ;
365
- rev .ignore_merges = 0 ;
366
+ rev .diffopt . recursive = 1 ;
366
367
rev .combine_merges = 1 ;
367
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 ;
371
370
rev .no_walk = 1 ;
372
- argc = setup_revisions (argc , argv , & rev , "HEAD" );
373
371
return cmd_log_wc (argc , argv , envp , & rev );
374
372
}
375
373
@@ -378,10 +376,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
378
376
struct rev_info rev ;
379
377
380
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" );
385
379
return cmd_log_wc (argc , argv , envp , & rev );
386
380
}
387
381
0 commit comments