diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:43 -0700 |
| commit | 76a89d6d828486f96f42c69ef0cf87bb6b72fef5 (patch) | |
| tree | e5112817beba1e701d20e88b4d0c5bdf5fe7de0d /diff.h | |
| parent | 78c6e0f3fa41d697f2e01850b0a361e21095545d (diff) | |
| parent | f31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d (diff) | |
| download | git-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.tar.gz | |
Merge branch 'jc/rename-degrade-cc-to-c'
* 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 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -111,6 +111,7 @@ struct diff_options { int rename_score; int rename_limit; int needed_rename_limit; + int degraded_cc_to_c; int show_rename_progress; int dirstat_percent; int setup; @@ -273,6 +274,7 @@ extern void diffcore_fix_diff_index(struct diff_options *); extern int diff_queue_is_empty(void); extern void diff_flush(struct diff_options*); +extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc); /* diff-raw status letters */ #define DIFF_STATUS_ADDED 'A' |