diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-06-16 00:46:30 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2019-06-16 13:49:03 +0100 |
| commit | 91a300b7f0a6b9e6ecaa940268dc9a907e8f7691 (patch) | |
| tree | 5f128c097fbff905f1c4fca5dd42fa854011eeb9 /src/merge_driver.c | |
| parent | c3bbbcf5670657ff567e2eb5e8e62e53343bf36f (diff) | |
| download | libgit2-91a300b7f0a6b9e6ecaa940268dc9a907e8f7691.tar.gz | |
attr: rename constants and macros for consistencyethomson/attr
Our enumeration values are not generally suffixed with `T`. Further,
our enumeration names are generally more descriptive.
Diffstat (limited to 'src/merge_driver.c')
| -rw-r--r-- | src/merge_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/merge_driver.c b/src/merge_driver.c index 8b7e3559a..a529aefda 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -371,17 +371,17 @@ static int merge_driver_name_for_path( return error; /* set: use the built-in 3-way merge driver ("text") */ - if (GIT_ATTR_TRUE(value)) + if (GIT_ATTR_IS_TRUE(value)) *out = merge_driver_name__text; /* unset: do not merge ("binary") */ - else if (GIT_ATTR_FALSE(value)) + else if (GIT_ATTR_IS_FALSE(value)) *out = merge_driver_name__binary; - else if (GIT_ATTR_UNSPECIFIED(value) && default_driver) + else if (GIT_ATTR_IS_UNSPECIFIED(value) && default_driver) *out = default_driver; - else if (GIT_ATTR_UNSPECIFIED(value)) + else if (GIT_ATTR_IS_UNSPECIFIED(value)) *out = merge_driver_name__text; else |