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

Use DIFF_DETECT_RENAME for detect_rename assignments

Browse Source 
This field can have two values (2 for copy). Use this name instead for
clarity. Many places have already used this constant.

Note, the detect_rename assignments in merge-recursive.c remain
unchanged because it's actually a boolean there.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2017-12-27 17:18:35 +07:00 committed by Junio C Hamano
parent 6de5aafdd1
commit 06dba2b023
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -1473,7 +1473,7 @@ static void print_summary(const char *prefix, const struct object_id *oid,
rev.show_root_diff = 1; rev.show_root_diff = 1;
get_commit_format(format.buf, &rev); get_commit_format(format.buf, &rev);
rev.always_show_header = 0; rev.always_show_header = 0;
rev.diffopt.detect_rename = 1; rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
rev.diffopt.break_opt = 0; rev.diffopt.break_opt = 0;
diff_setup_done(&rev.diffopt); diff_setup_done(&rev.diffopt);

2
diff.c
View File

@ -218,7 +218,7 @@ static int parse_ws_error_highlight(const char *arg)
*/ */
void init_diff_ui_defaults(void) void init_diff_ui_defaults(void)
{ {
diff_detect_rename_default = 1; diff_detect_rename_default = DIFF_DETECT_RENAME;
} }
int git_diff_heuristic_config(const char *var, const char *value, void *cb) int git_diff_heuristic_config(const char *var, const char *value, void *cb)

4
wt-status.c
View File

@ -603,7 +603,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_collect_updated_cb; rev.diffopt.format_callback = wt_status_collect_updated_cb;
rev.diffopt.format_callback_data = s; rev.diffopt.format_callback_data = s;
rev.diffopt.detect_rename = 1; rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
rev.diffopt.rename_limit = 200; rev.diffopt.rename_limit = 200;
rev.diffopt.break_opt = 0; rev.diffopt.break_opt = 0;
copy_pathspec(&rev.prune_data, &s->pathspec); copy_pathspec(&rev.prune_data, &s->pathspec);
@ -937,7 +937,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)
setup_revisions(0, NULL, &rev, &opt); setup_revisions(0, NULL, &rev, &opt);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH; rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.diffopt.detect_rename = 1; rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
rev.diffopt.file = s->fp; rev.diffopt.file = s->fp;
rev.diffopt.close_file = 0; rev.diffopt.close_file = 0;
/* /*