Skip to content

Commit 06dba2b

Browse files
pcloudsgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6de5aaf commit 06dba2b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

builtin/commit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@ static void print_summary(const char *prefix, const struct object_id *oid,
14731473
rev.show_root_diff = 1;
14741474
get_commit_format(format.buf, &rev);
14751475
rev.always_show_header = 0;
1476-
rev.diffopt.detect_rename = 1;
1476+
rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
14771477
rev.diffopt.break_opt = 0;
14781478
diff_setup_done(&rev.diffopt);
14791479

diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int parse_ws_error_highlight(const char *arg)
218218
*/
219219
void init_diff_ui_defaults(void)
220220
{
221-
diff_detect_rename_default = 1;
221+
diff_detect_rename_default = DIFF_DETECT_RENAME;
222222
}
223223

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

wt-status.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
603603
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
604604
rev.diffopt.format_callback = wt_status_collect_updated_cb;
605605
rev.diffopt.format_callback_data = s;
606-
rev.diffopt.detect_rename = 1;
606+
rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
607607
rev.diffopt.rename_limit = 200;
608608
rev.diffopt.break_opt = 0;
609609
copy_pathspec(&rev.prune_data, &s->pathspec);
@@ -937,7 +937,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)
937937
setup_revisions(0, NULL, &rev, &opt);
938938

939939
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
940-
rev.diffopt.detect_rename = 1;
940+
rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
941941
rev.diffopt.file = s->fp;
942942
rev.diffopt.close_file = 0;
943943
/*

0 commit comments

Comments
 (0)