summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 04:39:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-17 04:39:59 (GMT)
commit7fb0eaa289576a1dcd7751015ba791f1bce778a9 (patch)
tree76431538981b60bd62b95c810f3a18fe77f39355 /ll-merge.c
parentdea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69 (diff)
downloadgit-7fb0eaa289576a1dcd7751015ba791f1bce778a9.zip
git-7fb0eaa289576a1dcd7751015ba791f1bce778a9.tar.gz
git-7fb0eaa289576a1dcd7751015ba791f1bce778a9.tar.bz2
git_attr(): fix function signature
The function took (name, namelen) as its arguments, but all the public callers wanted to pass a full string. Demote the counted-string interface to an internal API status, and allow public callers to just pass the string to the function. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 2d6b6d6..f4b0a07 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -344,7 +344,7 @@ static const char *git_path_check_merge(const char *path)
static struct git_attr_check attr_merge_check;
if (!attr_merge_check.attr)
- attr_merge_check.attr = git_attr("merge", 5);
+ attr_merge_check.attr = git_attr("merge");
if (git_checkattr(path, 1, &attr_merge_check))
return NULL;