diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
| commit | b3c89315a33fbded4a8c5d533ca8ddc6087e4c23 (patch) | |
| tree | 804bd0c440bcbd6c365460e5d60163b44cd8c200 /builtin/log.c | |
| parent | e596fd295fbb6e7453cd541554ba27ab185f870d (diff) | |
| parent | f31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d (diff) | |
| download | git-b3c89315a33fbded4a8c5d533ca8ddc6087e4c23.tar.gz git-b3c89315a33fbded4a8c5d533ca8ddc6087e4c23.tar.xz | |
Merge branch 'jc/rename-degrade-cc-to-c' into maint
* jc/rename-degrade-cc-to-c:
diffcore-rename: fall back to -C when -C -C busts the rename limit
diffcore-rename: record filepair for rename src
diffcore-rename: refactor "too many candidates" logic
builtin/diff.c: remove duplicated call to diff_result_code()
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index c6dce9b89..55abe0761 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -256,6 +256,8 @@ static void finish_early_output(struct rev_info *rev) static int cmd_log_walk(struct rev_info *rev) { struct commit *commit; + int saved_nrl = 0; + int saved_dcctc = 0; if (rev->early_output) setup_early_output(rev); @@ -286,7 +288,14 @@ static int cmd_log_walk(struct rev_info *rev) } free_commit_list(commit->parents); commit->parents = NULL; + if (saved_nrl < rev->diffopt.needed_rename_limit) + saved_nrl = rev->diffopt.needed_rename_limit; + if (rev->diffopt.degraded_cc_to_c) + saved_dcctc = 1; } + rev->diffopt.degraded_cc_to_c = saved_dcctc; + rev->diffopt.needed_rename_limit = saved_nrl; + if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF && DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) { return 02; |