proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 13:12:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checkout: add structure for CRLF.

Browse Source
This commit is contained in:
Ben Straub 2012-07-09 20:21:22 -07:00
parent 4a26ee4fd4
commit f2d42eea34
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/crlf.c
View File

@ -184,7 +184,8 @@ static int crlf_apply_to_odb(git_filter *self, git_buf *dest, const git_buf *sou
return drop_crlf(dest, source); return drop_crlf(dest, source);
} }
int git_filter_add__crlf_to_odb(git_vector *filters, git_repository *repo, const char *path) static int find_and_add_filter(git_vector *filters, git_repository *repo, const char *path,
int (*apply)(struct git_filter *self, git_buf *dest, const git_buf *source))
{ {
struct crlf_attrs ca; struct crlf_attrs ca;
struct crlf_filter *filter; struct crlf_filter *filter;
@ -219,10 +220,25 @@ int git_filter_add__crlf_to_odb(git_vector *filters, git_repository *repo, const
filter = git__malloc(sizeof(struct crlf_filter)); filter = git__malloc(sizeof(struct crlf_filter));
GITERR_CHECK_ALLOC(filter); GITERR_CHECK_ALLOC(filter);
filter->f.apply = &crlf_apply_to_odb; filter->f.apply = apply;
filter->f.do_free = NULL; filter->f.do_free = NULL;
memcpy(&filter->attrs, &ca, sizeof(struct crlf_attrs)); memcpy(&filter->attrs, &ca, sizeof(struct crlf_attrs));
return git_vector_insert(filters, filter); return git_vector_insert(filters, filter);
} }
static int crlf_apply_to_workdir(git_filter *self, git_buf *dest, const git_buf *source)
{
/* TODO */
return 0;
}
int git_filter_add__crlf_to_odb(git_vector *filters, git_repository *repo, const char *path)
{
return find_and_add_filter(filters, repo, path, &crlf_apply_to_odb);
}
int git_filter_add__crlf_to_workdir(git_vector *filters, git_repository *repo, const char *path)
{
return find_and_add_filter(filters, repo, path, &crlf_apply_to_workdir);
}

6
src/filter.c
View File

@ -95,8 +95,9 @@ int git_filters_load(git_vector *filters, git_repository *repo, const char *path
if (error < 0) if (error < 0)
return error; return error;
} else { } else {
giterr_set(GITERR_INVALID, "Worktree filters are not implemented yet"); error = git_filter_add__crlf_to_workdir(filters, repo, path);
return -1; if (error < 0)
return error;
} }
return (int)filters->length; return (int)filters->length;
@ -162,4 +163,3 @@ int git_filters_apply(git_buf *dest, git_buf *source, git_vector *filters)
return 0; return 0;
} }

3
src/filter.h
View File

@ -96,6 +96,9 @@ extern void git_filters_free(git_vector *filters);
/* Strip CRLF, from Worktree to ODB */ /* Strip CRLF, from Worktree to ODB */
extern int git_filter_add__crlf_to_odb(git_vector *filters, git_repository *repo, const char *path); extern int git_filter_add__crlf_to_odb(git_vector *filters, git_repository *repo, const char *path);
/* Add CRLF, from ODB to worktree */
extern int git_filter_add__crlf_to_workdir(git_vector *filters, git_repository *repo, const char *path);
/* /*
* PLAINTEXT API * PLAINTEXT API