diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-01-07 10:15:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 10:15:25 +0000 |
| commit | c31032a3cf449b77c1ca2a966ec3ca31f2f1fb00 (patch) | |
| tree | 92b5a310acc247f13ee36d69de7324c76815280e | |
| parent | 27e34f9b9843f7bcc33a4ccfe3e395fe303cba63 (diff) | |
| parent | 855f2998acfa58ce6f4a7a1a1b3d5d48475b2330 (diff) | |
| download | libgit2-c31032a3cf449b77c1ca2a966ec3ca31f2f1fb00.tar.gz | |
Merge pull request #5760 from libgit2/ethomson/tttoo_many_ttts
blob: fix name of `GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD`
| -rw-r--r-- | include/git2/blob.h | 2 | ||||
| -rw-r--r-- | include/git2/deprecated.h | 9 | ||||
| -rw-r--r-- | src/blob.c | 2 | ||||
| -rw-r--r-- | tests/filter/bare.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/include/git2/blob.h b/include/git2/blob.h index 741b28f4c..ff473993a 100644 --- a/include/git2/blob.h +++ b/include/git2/blob.h @@ -113,7 +113,7 @@ typedef enum { * When set, filters will be loaded from a `.gitattributes` file * in the HEAD commit. */ - GIT_BLOB_FILTER_ATTTRIBUTES_FROM_HEAD = (1 << 2), + GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD = (1 << 2), } git_blob_filter_flag_t; /** diff --git a/include/git2/deprecated.h b/include/git2/deprecated.h index 4e43c4536..79f637a7f 100644 --- a/include/git2/deprecated.h +++ b/include/git2/deprecated.h @@ -80,16 +80,19 @@ typedef git_attr_value_t git_attr_t; /**@}*/ -/** @name Deprecated Blob Functions +/** @name Deprecated Blob Functions and Constants * - * These functions are retained for backward compatibility. The newer - * versions of these functions should be preferred in all new code. + * These functions and enumeration values are retained for backward + * compatibility. The newer versions of these functions and values + * should be preferred in all new code. * * There is no plan to remove these backward compatibility values at * this time. */ /**@{*/ +#define GIT_BLOB_FILTER_ATTTRIBUTES_FROM_HEAD GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD + GIT_EXTERN(int) git_blob_create_fromworkdir(git_oid *id, git_repository *repo, const char *relative_path); GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *id, git_repository *repo, const char *path); GIT_EXTERN(int) git_blob_create_fromstream( diff --git a/src/blob.c b/src/blob.c index 545c10eb8..ef4ad2e7e 100644 --- a/src/blob.c +++ b/src/blob.c @@ -448,7 +448,7 @@ int git_blob_filter( if ((opts.flags & GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES) != 0) flags |= GIT_FILTER_NO_SYSTEM_ATTRIBUTES; - if ((opts.flags & GIT_BLOB_FILTER_ATTTRIBUTES_FROM_HEAD) != 0) + if ((opts.flags & GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD) != 0) flags |= GIT_FILTER_ATTRIBUTES_FROM_HEAD; if (!(error = git_filter_list_load( diff --git a/tests/filter/bare.c b/tests/filter/bare.c index 430931ee8..7319b5203 100644 --- a/tests/filter/bare.c +++ b/tests/filter/bare.c @@ -10,7 +10,7 @@ void test_filter_bare__initialize(void) cl_git_pass(git_repository_open(&g_repo, "crlf.git")); filter_opts.flags |= GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES; - filter_opts.flags |= GIT_BLOB_FILTER_ATTTRIBUTES_FROM_HEAD; + filter_opts.flags |= GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD; } void test_filter_bare__cleanup(void) |