mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-09 20:08:50 +00:00
Checkout: add structure for CRLF.
This commit is contained in:
parent
4a26ee4fd4
commit
f2d42eea34
20
src/crlf.c
20
src/crlf.c
@ -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);
|
||||
}
|
||||
|
||||
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_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));
|
||||
GITERR_CHECK_ALLOC(filter);
|
||||
|
||||
filter->f.apply = &crlf_apply_to_odb;
|
||||
filter->f.apply = apply;
|
||||
filter->f.do_free = NULL;
|
||||
memcpy(&filter->attrs, &ca, sizeof(struct crlf_attrs));
|
||||
|
||||
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);
|
||||
}
|
||||
|
@ -95,8 +95,9 @@ int git_filters_load(git_vector *filters, git_repository *repo, const char *path
|
||||
if (error < 0)
|
||||
return error;
|
||||
} else {
|
||||
giterr_set(GITERR_INVALID, "Worktree filters are not implemented yet");
|
||||
return -1;
|
||||
error = git_filter_add__crlf_to_workdir(filters, repo, path);
|
||||
if (error < 0)
|
||||
return error;
|
||||
}
|
||||
|
||||
return (int)filters->length;
|
||||
@ -162,4 +163,3 @@ int git_filters_apply(git_buf *dest, git_buf *source, git_vector *filters)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -96,6 +96,9 @@ extern void git_filters_free(git_vector *filters);
|
||||
/* Strip CRLF, from Worktree to ODB */
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user