summaryrefslogtreecommitdiff
path: root/src/blob.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-09-11 16:38:33 -0700
committerRussell Belfer <rb@github.com>2013-09-17 09:31:45 -0700
commit4b11f25a4fbb6952284e037a70e2d61fde841ab6 (patch)
tree41929ce26c3c41183b3fc221927afb67444eadf2 /src/blob.c
parent40cb40fab93281c808255d980bbe81a18a4d9e9a (diff)
downloadlibgit2-4b11f25a4fbb6952284e037a70e2d61fde841ab6.tar.gz
Add ident filter
This adds the ident filter (that knows how to replace $Id$) and tweaks the filter APIs and code so that git_filter_source objects actually have the updated OID of the object being filtered when it is a known value.
Diffstat (limited to 'src/blob.c')
-rw-r--r--src/blob.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/blob.c b/src/blob.c
index e6bba033a..97fd6f70d 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -195,7 +195,7 @@ int git_blob__create_from_paths(
if (try_load_filters)
/* Load the filters for writing this file to the ODB */
error = git_filter_list_load(
- &fl, repo, hint_path, GIT_FILTER_TO_ODB);
+ &fl, repo, NULL, hint_path, GIT_FILTER_TO_ODB);
if (error < 0)
/* well, that didn't work */;
@@ -331,19 +331,19 @@ int git_blob_is_binary(git_blob *blob)
int git_blob_filtered_content(
git_buffer *out,
git_blob *blob,
- const char *as_path,
+ const char *path,
int check_for_binary_data)
{
int error = 0;
git_filter_list *fl = NULL;
- assert(blob && as_path && out);
+ assert(blob && path && out);
if (check_for_binary_data && git_blob_is_binary(blob))
return 0;
if (!(error = git_filter_list_load(
- &fl, git_blob_owner(blob), as_path, GIT_FILTER_TO_WORKTREE))) {
+ &fl, git_blob_owner(blob), blob, path, GIT_FILTER_TO_WORKTREE))) {
error = git_filter_list_apply_to_blob(out, fl, blob);