diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-31 19:19:08 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 03:50:03 +0100 |
| commit | 3b69daed861daec1923c369d59c97e46eb3c3d7b (patch) | |
| tree | bc66d274c0b97aa27526320778387e557dc22dbe /diffcore-rename.c | |
| parent | diff: remove touched flags (diff) | |
| download | git-3b69daed861daec1923c369d59c97e46eb3c3d7b.tar.xz git-3b69daed861daec1923c369d59c97e46eb3c3d7b.zip | |
diff: remove DIFF_OPT_TST macro
Remove the `DIFF_OPT_TST` macro and instead access the flags directly.
This conversion is done using the following semantic patch:
@@
expression E;
identifier fld;
@@
- DIFF_OPT_TST(&E, fld)
+ E.flags.fld
@@
type T;
T *ptr;
identifier fld;
@@
- DIFF_OPT_TST(ptr, fld)
+ ptr->flags.fld
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 0d8c3d2ee4..bd077ee111 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -405,7 +405,7 @@ static int too_many_rename_candidates(int num_create, num_src > num_create ? num_src : num_create; /* Are we running under -C -C? */ - if (!DIFF_OPT_TST(options, FIND_COPIES_HARDER)) + if (!options->flags.FIND_COPIES_HARDER) return 1; /* Would we bust the limit if we were running under -C? */ @@ -463,7 +463,7 @@ void diffcore_rename(struct diff_options *options) else if (options->single_follow && strcmp(options->single_follow, p->two->path)) continue; /* not interested */ - else if (!DIFF_OPT_TST(options, RENAME_EMPTY) && + else if (!options->flags.RENAME_EMPTY && is_empty_blob_oid(&p->two->oid)) continue; else if (add_rename_dst(p->two) < 0) { @@ -473,7 +473,7 @@ void diffcore_rename(struct diff_options *options) goto cleanup; } } - else if (!DIFF_OPT_TST(options, RENAME_EMPTY) && + else if (!options->flags.RENAME_EMPTY && is_empty_blob_oid(&p->one->oid)) continue; else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) { |