Merge pull request #2961 from ethomson/filter_relative_paths

Filter relative paths

2 files changed, 98 insertions, 2 deletions

diff --git a/src/filter.c b/src/filter.c
index 4fbf84f6a..6d0d48015 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -874,7 +874,6 @@ void stream_list_free(git_vector *streams)
 
 #define STREAM_BUFSIZE 10240
 
-/* TODO: maybe not use filter_stream as a target but create one */
 int git_filter_list_stream_file(
 	git_filter_list *filters,
 	git_repository *repo,
@@ -894,7 +893,7 @@ int git_filter_list_stream_file(
 		(error = git_path_join_unrooted(&abspath, path, base, NULL)) < 0)
 		goto done;
 
-	if ((fd = git_futils_open_ro(path)) < 0) {
+	if ((fd = git_futils_open_ro(abspath.ptr)) < 0) {
 		error = fd;
 		goto done;
 	}
diff --git a/tests/filter/file.c b/tests/filter/file.c
new file mode 100644
index 000000000..865c416c5
--- /dev/null
+++ b/tests/filter/file.c
@@ -0,0 +1,97 @@
+#include "clar_libgit2.h"
+#include "git2/sys/filter.h"
+#include "crlf.h"
+#include "buffer.h"
+
+static git_repository *g_repo = NULL;
+
+void test_filter_file__initialize(void)
+{
+	git_reference *head_ref;
+	git_commit *head;
+
+	g_repo = cl_git_sandbox_init("crlf");
+
+	cl_git_mkfile("crlf/.gitattributes",
+		"*.txt text\n*.bin binary\n*.crlf text eol=crlf\n*.lf text eol=lf\n");
+
+	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_reset(g_repo, (git_object *)head, GIT_RESET_HARD, NULL));
+
+	git_commit_free(head);
+	git_reference_free(head_ref);
+}
+
+void test_filter_file__cleanup(void)
+{
+	cl_git_sandbox_cleanup();
+}
+
+void test_filter_file__apply(void)
+{
+	git_filter_list *fl;
+	git_filter *crlf;
+	git_buf buf = GIT_BUF_INIT;
+
+	cl_git_pass(git_filter_list_new(
+		&fl, g_repo, GIT_FILTER_TO_ODB, 0));
+
+	crlf = git_filter_lookup(GIT_FILTER_CRLF);
+	cl_assert(crlf != NULL);
+
+	cl_git_pass(git_filter_list_push(fl, crlf, NULL));
+
+	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_filter_list_free(fl);
+}
+
+struct buf_writestream {
+	git_writestream base;
+	git_buf buf;
+};
+
+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);
+}
+
+int buf_writestream_close(git_writestream *s)
+{
+	return 0;
+}
+
+void buf_writestream_free(git_writestream *s)
+{
+	struct buf_writestream *stream = (struct buf_writestream *)s;
+	git_buf_free(&stream->buf);
+}
+
+void test_filter_file__apply_stream(void)
+{
+	git_filter_list *fl;
+	git_filter *crlf;
+	struct buf_writestream write_target = { {
+		buf_writestream_write,
+		buf_writestream_close,
+		buf_writestream_free } };
+
+	cl_git_pass(git_filter_list_new(
+		&fl, g_repo, GIT_FILTER_TO_ODB, 0));
+
+	crlf = git_filter_lookup(GIT_FILTER_CRLF);
+	cl_assert(crlf != NULL);
+
+	cl_git_pass(git_filter_list_push(fl, crlf, NULL));
+
+	cl_git_pass(git_filter_list_stream_file(fl, g_repo, "all-crlf", (git_writestream *)&write_target));
+	cl_assert_equal_s("crlf\ncrlf\ncrlf\ncrlf\n", write_target.buf.ptr);
+
+	git_filter_list_free(fl);
+}