@matheusbsbs / matheus-bagliano / commits / 06dba2b023

Use DIFF_DETECT_RENAME for detect_rename assignments

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>

Nguyễn Thái Ngọc Duy committed Dec 27, 2017 at 17:18 UTC 06dba2b0235293e84157a59fa22dc89baa336166

3 files changed +4 -4

builtin/commit.c

+1 -1

@@ -1473,7 +1473,7 @@ static void print_summary(const char *prefix, const struct object_id *oid,

1473 rev.show_root_diff = 1;

1474 get_commit_format(format.buf, &rev);

1475 rev.always_show_header = 0;

1476 - rev.diffopt.detect_rename = 1;

1476 + rev.diffopt.detect_rename = DIFF_DETECT_RENAME;

1477 rev.diffopt.break_opt = 0;

1478 diff_setup_done(&rev.diffopt);

1479

diff.c

+1 -1

@@ -218,7 +218,7 @@ static int parse_ws_error_highlight(const char *arg)

218 */

219 void init_diff_ui_defaults(void)

220 {

221 - diff_detect_rename_default = 1;

221 + diff_detect_rename_default = DIFF_DETECT_RENAME;

222 }

223

224 int git_diff_heuristic_config(const char *var, const char *value, void *cb)

wt-status.c

+2 -2

@@ -603,7 +603,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)

603 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;

604 rev.diffopt.format_callback = wt_status_collect_updated_cb;

605 rev.diffopt.format_callback_data = s;

606 - rev.diffopt.detect_rename = 1;

606 + rev.diffopt.detect_rename = DIFF_DETECT_RENAME;

607 rev.diffopt.rename_limit = 200;

608 rev.diffopt.break_opt = 0;

609 copy_pathspec(&rev.prune_data, &s->pathspec);

@@ -937,7 +937,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)

937 setup_revisions(0, NULL, &rev, &opt);

938

939 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;

940 - rev.diffopt.detect_rename = 1;

940 + rev.diffopt.detect_rename = DIFF_DETECT_RENAME;

941 rev.diffopt.file = s->fp;

942 rev.diffopt.close_file = 0;

943 /*