proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 06:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

signature: Fix optional header

Browse Source
This commit is contained in:
Vicent Marti 2011-07-08 18:31:05 +02:00
parent 27df4275f2
commit d483a911b8
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commit.c
View File

@ -125,8 +125,8 @@ int git_commit_create(
git_odb_stream *stream; git_odb_stream *stream;
message_length = strlen(message); message_length = strlen(message);
author_length = git_signature__write(&author_str, "author", author); author_length = git_signature__write(&author_str, "author ", author);
committer_length = git_signature__write(&committer_str, "committer", committer); committer_length = git_signature__write(&committer_str, "committer ", committer);
if (author_length < 0 || committer_length < 0) if (author_length < 0 || committer_length < 0)
return git__throw(GIT_EINVALIDARGS, "Cannot create commit. Failed to parse signature"); return git__throw(GIT_EINVALIDARGS, "Cannot create commit. Failed to parse signature");

14
src/signature.c
View File

@ -330,16 +330,10 @@ int git_signature__write(char **signature, const char *header, const git_signatu
hours = offset / 60; hours = offset / 60;
mins = offset % 60; mins = offset % 60;
if (header) sig_buffer_len = snprintf(sig_buffer, sizeof(sig_buffer),
sig_buffer_len = snprintf(sig_buffer, sizeof(sig_buffer), "%s%s <%s> %u %c%02d%02d\n",
"%s %s <%s> %u %c%02d%02d\n", header ? header : "", sig->name, sig->email,
header, sig->name, sig->email, (unsigned)sig->when.time, sign, hours, mins);
(unsigned)sig->when.time, sign, hours, mins);
else
sig_buffer_len = snprintf(sig_buffer, sizeof(sig_buffer),
"%s <%s> %u %c%02d%02d\n",
sig->name, sig->email,
(unsigned)sig->when.time, sign, hours, mins);
if (sig_buffer_len < 0 || (size_t)sig_buffer_len > sizeof(sig_buffer)) if (sig_buffer_len < 0 || (size_t)sig_buffer_len > sizeof(sig_buffer))
return GIT_ENOMEM; return GIT_ENOMEM;

4
src/tag.c
View File

@ -227,7 +227,7 @@ int git_tag_create(
} }
type_str = git_object_type2string(git_object_type(target)); type_str = git_object_type2string(git_object_type(target));
tagger_str_len = git_signature__write(&tagger_str, "tagger", tagger); tagger_str_len = git_signature__write(&tagger_str, "tagger ", tagger);
type_str_len = strlen(type_str); type_str_len = strlen(type_str);
tag_name_len = strlen(tag_name); tag_name_len = strlen(tag_name);
@ -413,4 +413,4 @@ int git_tag_list_match(git_strarray *tag_names, const char *pattern, git_reposit
int git_tag_list(git_strarray *tag_names, git_repository *repo) int git_tag_list(git_strarray *tag_names, git_repository *repo)
{ {
return git_tag_list_match(tag_names, "", repo); return git_tag_list_match(tag_names, "", repo);
} }