mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-29 15:10:02 +00:00
tag: Fix parsing when no tagger nor message
This commit is contained in:
parent
5a5bd64024
commit
24cb87e2a6
@ -121,7 +121,7 @@ GIT_EXTERN(const char *) git_tag_name(const git_tag *tag);
|
|||||||
* Get the tagger (author) of a tag
|
* Get the tagger (author) of a tag
|
||||||
*
|
*
|
||||||
* @param tag a previously loaded tag.
|
* @param tag a previously loaded tag.
|
||||||
* @return reference to the tag's author
|
* @return reference to the tag's author or NULL when unspecified
|
||||||
*/
|
*/
|
||||||
GIT_EXTERN(const git_signature *) git_tag_tagger(const git_tag *tag);
|
GIT_EXTERN(const git_signature *) git_tag_tagger(const git_tag *tag);
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ GIT_EXTERN(const git_signature *) git_tag_tagger(const git_tag *tag);
|
|||||||
* Get the message of a tag
|
* Get the message of a tag
|
||||||
*
|
*
|
||||||
* @param tag a previously loaded tag.
|
* @param tag a previously loaded tag.
|
||||||
* @return message of the tag
|
* @return message of the tag or NULL when unspecified
|
||||||
*/
|
*/
|
||||||
GIT_EXTERN(const char *) git_tag_message(const git_tag *tag);
|
GIT_EXTERN(const char *) git_tag_message(const git_tag *tag);
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ int git_tag__parse_buffer(git_tag *tag, const char *buffer, size_t length)
|
|||||||
buffer = search + 1;
|
buffer = search + 1;
|
||||||
|
|
||||||
tag->tagger = NULL;
|
tag->tagger = NULL;
|
||||||
if (*buffer != '\n') {
|
if (buffer < buffer_end && *buffer != '\n') {
|
||||||
tag->tagger = git__malloc(sizeof(git_signature));
|
tag->tagger = git__malloc(sizeof(git_signature));
|
||||||
GITERR_CHECK_ALLOC(tag->tagger);
|
GITERR_CHECK_ALLOC(tag->tagger);
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ void test_network_fetchlocal__complete(void)
|
|||||||
cl_git_pass(git_remote_update_tips(origin));
|
cl_git_pass(git_remote_update_tips(origin));
|
||||||
|
|
||||||
cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL));
|
cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL));
|
||||||
cl_assert_equal_i(18, (int)refnames.count);
|
cl_assert_equal_i(19, (int)refnames.count);
|
||||||
cl_assert(callcount > 0);
|
cl_assert(callcount > 0);
|
||||||
|
|
||||||
git_strarray_free(&refnames);
|
git_strarray_free(&refnames);
|
||||||
@ -70,7 +70,7 @@ void test_network_fetchlocal__partial(void)
|
|||||||
git_strarray_free(&refnames);
|
git_strarray_free(&refnames);
|
||||||
|
|
||||||
cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL));
|
cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL));
|
||||||
cl_assert_equal_i(19, (int)refnames.count); /* 18 remote + 1 local */
|
cl_assert_equal_i(20, (int)refnames.count); /* 18 remote + 1 local */
|
||||||
cl_assert(callcount > 0);
|
cl_assert(callcount > 0);
|
||||||
|
|
||||||
git_strarray_free(&refnames);
|
git_strarray_free(&refnames);
|
||||||
|
@ -72,7 +72,7 @@ void test_network_remote_local__retrieve_advertised_references(void)
|
|||||||
|
|
||||||
cl_git_pass(git_remote_ls(remote, &count_ref__cb, &how_many_refs));
|
cl_git_pass(git_remote_ls(remote, &count_ref__cb, &how_many_refs));
|
||||||
|
|
||||||
cl_assert_equal_i(how_many_refs, 26);
|
cl_assert_equal_i(how_many_refs, 28);
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_network_remote_local__retrieve_advertised_references_from_spaced_repository(void)
|
void test_network_remote_local__retrieve_advertised_references_from_spaced_repository(void)
|
||||||
@ -86,7 +86,7 @@ void test_network_remote_local__retrieve_advertised_references_from_spaced_repos
|
|||||||
|
|
||||||
cl_git_pass(git_remote_ls(remote, &count_ref__cb, &how_many_refs));
|
cl_git_pass(git_remote_ls(remote, &count_ref__cb, &how_many_refs));
|
||||||
|
|
||||||
cl_assert_equal_i(how_many_refs, 26);
|
cl_assert_equal_i(how_many_refs, 28);
|
||||||
|
|
||||||
git_remote_free(remote); /* Disconnect from the "spaced repo" before the cleanup */
|
git_remote_free(remote); /* Disconnect from the "spaced repo" before the cleanup */
|
||||||
remote = NULL;
|
remote = NULL;
|
||||||
|
@ -9,6 +9,7 @@ static const char *bad_tag_id = "eda9f45a2a98d4c17a09d681d88569fa4ea91755";
|
|||||||
static const char *badly_tagged_commit = "e90810b8df3e80c413d903f631643c716887138d";
|
static const char *badly_tagged_commit = "e90810b8df3e80c413d903f631643c716887138d";
|
||||||
static const char *short_tag_id = "5da7760512a953e3c7c4e47e4392c7a4338fb729";
|
static const char *short_tag_id = "5da7760512a953e3c7c4e47e4392c7a4338fb729";
|
||||||
static const char *short_tagged_commit = "4a5ed60bafcf4638b7c8356bd4ce1916bfede93c";
|
static const char *short_tagged_commit = "4a5ed60bafcf4638b7c8356bd4ce1916bfede93c";
|
||||||
|
static const char *taggerless = "4a23e2e65ad4e31c4c9db7dc746650bfad082679";
|
||||||
|
|
||||||
static git_repository *g_repo;
|
static git_repository *g_repo;
|
||||||
|
|
||||||
@ -117,3 +118,25 @@ void test_object_tag_read__parse_without_message(void)
|
|||||||
git_commit_free(commit);
|
git_commit_free(commit);
|
||||||
git_repository_free(short_tag_repo);
|
git_repository_free(short_tag_repo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void test_object_tag_read__without_tagger_nor_message(void)
|
||||||
|
{
|
||||||
|
git_tag *tag;
|
||||||
|
git_oid id;
|
||||||
|
git_repository *repo;
|
||||||
|
|
||||||
|
cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git")));
|
||||||
|
|
||||||
|
cl_git_pass(git_oid_fromstr(&id, taggerless));
|
||||||
|
|
||||||
|
cl_git_pass(git_tag_lookup(&tag, repo, &id));
|
||||||
|
|
||||||
|
cl_assert_equal_s(git_tag_name(tag), "taggerless");
|
||||||
|
cl_assert(git_tag_target_type(tag) == GIT_OBJ_COMMIT);
|
||||||
|
|
||||||
|
cl_assert(tag->message == NULL);
|
||||||
|
cl_assert(tag->tagger == NULL);
|
||||||
|
|
||||||
|
git_tag_free(tag);
|
||||||
|
git_repository_free(repo);
|
||||||
|
}
|
||||||
|
@ -28,8 +28,8 @@ static int foreach_cb(const git_oid *oid, void *data)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* $ git --git-dir tests-clar/resources/testrepo.git count-objects --verbose
|
* $ git --git-dir tests-clar/resources/testrepo.git count-objects --verbose
|
||||||
* count: 43
|
* count: 47
|
||||||
* size: 3
|
* size: 4
|
||||||
* in-pack: 1640
|
* in-pack: 1640
|
||||||
* packs: 3
|
* packs: 3
|
||||||
* size-pack: 425
|
* size-pack: 425
|
||||||
@ -42,7 +42,7 @@ void test_odb_foreach__foreach(void)
|
|||||||
git_repository_odb(&_odb, _repo);
|
git_repository_odb(&_odb, _repo);
|
||||||
|
|
||||||
cl_git_pass(git_odb_foreach(_odb, foreach_cb, NULL));
|
cl_git_pass(git_odb_foreach(_odb, foreach_cb, NULL));
|
||||||
cl_assert_equal_i(46 + 1640, nobj); /* count + in-pack */
|
cl_assert_equal_i(47 + 1640, nobj); /* count + in-pack */
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_odb_foreach__one_pack(void)
|
void test_odb_foreach__one_pack(void)
|
||||||
|
@ -48,8 +48,8 @@ static void assert_retrieval(const char *glob, unsigned int flags, int expected_
|
|||||||
|
|
||||||
void test_refs_foreachglob__retrieve_all_refs(void)
|
void test_refs_foreachglob__retrieve_all_refs(void)
|
||||||
{
|
{
|
||||||
/* 8 heads (including one packed head) + 1 note + 2 remotes + 6 tags */
|
/* 12 heads (including one packed head) + 1 note + 2 remotes + 7 tags */
|
||||||
assert_retrieval("*", GIT_REF_LISTALL, 21);
|
assert_retrieval("*", GIT_REF_LISTALL, 22);
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_refs_foreachglob__retrieve_remote_branches(void)
|
void test_refs_foreachglob__retrieve_remote_branches(void)
|
||||||
|
Binary file not shown.
1
tests-clar/resources/testrepo.git/refs/tags/taggerless
Normal file
1
tests-clar/resources/testrepo.git/refs/tags/taggerless
Normal file
@ -0,0 +1 @@
|
|||||||
|
4a23e2e65ad4e31c4c9db7dc746650bfad082679
|
Loading…
Reference in New Issue
Block a user