undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/logopt' into next

Browse Source 
* lt/logopt:
  Fix "git log --stat": make sure to set recursive with --stat.
This commit is contained in:
Junio C Hamano 2006-04-18 13:18:21 -07:00
commit 524765efa5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
diff.c
View File

@ -1029,6 +1029,15 @@ int diff_setup_done(struct diff_options *options)
options->detect_rename != DIFF_DETECT_COPY) || options->detect_rename != DIFF_DETECT_COPY) ||
(0 <= options->rename_limit && !options->detect_rename)) (0 <= options->rename_limit && !options->detect_rename))
return -1; return -1;
/*
* These cases always need recursive; we do not drop caller-supplied
* recursive bits for other formats here.
*/
if ((options->output_format == DIFF_FORMAT_PATCH) ||
(options->output_format == DIFF_FORMAT_DIFFSTAT))
options->recursive = 1;
if (options->detect_rename && options->rename_limit < 0) if (options->detect_rename && options->rename_limit < 0)
options->rename_limit = diff_rename_limit_default; options->rename_limit = diff_rename_limit_default;
if (options->setup & DIFF_SETUP_USE_CACHE) { if (options->setup & DIFF_SETUP_USE_CACHE) {

2
revision.c
View File

@ -791,8 +791,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (revs->dense_combined_merges) if (revs->dense_combined_merges)
revs->diffopt.output_format = DIFF_FORMAT_PATCH; revs->diffopt.output_format = DIFF_FORMAT_PATCH;
} }
if (revs->diffopt.output_format == DIFF_FORMAT_PATCH)
revs->diffopt.recursive = 1;
revs->diffopt.abbrev = revs->abbrev; revs->diffopt.abbrev = revs->abbrev;
diff_setup_done(&revs->diffopt); diff_setup_done(&revs->diffopt);