summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2011-08-04 06:36:33 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-04 15:53:21 -0700
commitd932f4eb9fc88e93040635d291f6c195ea2e4ee3 (patch)
tree4f9399f476fdadb95b01c81e8c1bf86d0e114a0b /builtin
parentca64d061e0ddf7fa1496a15c75eb5e730c4360e0 (diff)
downloadgit-d932f4eb9fc88e93040635d291f6c195ea2e4ee3.tar.gz
Rename git_checkattr() to git_check_attr()
Suggested by: Junio Hamano <gitster@pobox.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/check-attr.c4
-rw-r--r--builtin/pack-objects.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index f20772ad6e..6b163687b6 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -45,8 +45,8 @@ static void check_attr(int cnt, struct git_attr_check *check,
const char *file)
{
if (check != NULL) {
- if (git_checkattr(file, cnt, check))
- die("git_checkattr died");
+ if (git_check_attr(file, cnt, check))
+ die("git_check_attr died");
output_attr(cnt, check, file);
} else {
if (git_all_attrs(file, &cnt, &check))
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 84e6dafb12..ac8bed8aa1 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -634,7 +634,7 @@ static int no_try_delta(const char *path)
struct git_attr_check check[1];
setup_delta_attr_check(check);
- if (git_checkattr(path, ARRAY_SIZE(check), check))
+ if (git_check_attr(path, ARRAY_SIZE(check), check))
return 0;
if (ATTR_FALSE(check->value))
return 1;