summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2011-08-04 04:36:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-04 22:53:21 (GMT)
commitd932f4eb9fc88e93040635d291f6c195ea2e4ee3 (patch)
tree4f9399f476fdadb95b01c81e8c1bf86d0e114a0b /ll-merge.c
parentca64d061e0ddf7fa1496a15c75eb5e730c4360e0 (diff)
downloadgit-d932f4eb9fc88e93040635d291f6c195ea2e4ee3.zip
git-d932f4eb9fc88e93040635d291f6c195ea2e4ee3.tar.gz
git-d932f4eb9fc88e93040635d291f6c195ea2e4ee3.tar.bz2
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 'll-merge.c')
-rw-r--r--ll-merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 6ce512e..da59738 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -330,7 +330,7 @@ static int git_path_check_merge(const char *path, struct git_attr_check check[2]
check[0].attr = git_attr("merge");
check[1].attr = git_attr("conflict-marker-size");
}
- return git_checkattr(path, 2, check);
+ return git_check_attr(path, 2, check);
}
static void normalize_file(mmfile_t *mm, const char *path)
@@ -387,7 +387,7 @@ int ll_merge_marker_size(const char *path)
if (!check.attr)
check.attr = git_attr("conflict-marker-size");
- if (!git_checkattr(path, 1, &check) && check.value) {
+ if (!git_check_attr(path, 1, &check) && check.value) {
marker_size = atoi(check.value);
if (marker_size <= 0)
marker_size = DEFAULT_CONFLICT_MARKER_SIZE;