#include "clar_libgit2.h"
#include "git2/sys/filter.h"
#include "crlf.h"
-#include "buffer.h"
static git_repository *g_repo = NULL;
cl_repo_set_bool(g_repo, "core.autocrlf", true);
cl_git_pass(git_repository_head(&head_ref, g_repo));
- cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(g_repo, (git_object *)head, GIT_RESET_HARD, NULL));
git_commit_free(head);
cl_git_pass(git_filter_list_apply_to_file(&buf, fl, g_repo, "all-crlf"));
cl_assert_equal_s("crlf\ncrlf\ncrlf\ncrlf\n", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_filter_list_free(fl);
}
struct buf_writestream {
git_writestream base;
- git_buf buf;
+ git_str buf;
};
-int buf_writestream_write(git_writestream *s, const char *buf, size_t len)
+static int buf_writestream_write(git_writestream *s, const char *buf, size_t len)
{
struct buf_writestream *stream = (struct buf_writestream *)s;
- return git_buf_put(&stream->buf, buf, len);
+ return git_str_put(&stream->buf, buf, len);
}
-int buf_writestream_close(git_writestream *s)
+static int buf_writestream_close(git_writestream *s)
{
GIT_UNUSED(s);
return 0;
}
-void buf_writestream_free(git_writestream *s)
+static void buf_writestream_free(git_writestream *s)
{
struct buf_writestream *stream = (struct buf_writestream *)s;
- git_buf_free(&stream->buf);
+ git_str_dispose(&stream->buf);
}
void test_filter_file__apply_stream(void)