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

commit: also match the first header field when searching

Browse Source 
We were searching only past the first header field, which meant we were
unable to find e.g. `tree` which is the first field.

While here, make sure to set an error message in case we cannot find the
field.
This commit is contained in:
Carlos Martín Nieto 2016-02-09 07:17:26 +01:00
parent 700f0aff24
commit f55eca167c
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/commit.c
View File

@ -564,41 +564,45 @@ int git_commit_nth_gen_ancestor(
int git_commit_header_field(git_buf *out, const git_commit *commit, const char *field) int git_commit_header_field(git_buf *out, const git_commit *commit, const char *field)
{ {
const char *buf = commit->raw_header; const char *eol, *buf = commit->raw_header;
const char *h, *eol;
git_buf_sanitize(out); git_buf_sanitize(out);
while ((h = strchr(buf, '\n')) && h[1] != '\0' && h[1] != '\n') {
h++; while ((eol = strchr(buf, '\n')) && eol[1] != '\0') {
if (git__prefixcmp(h, field)) { /* We can skip continuations here */
buf = h; if (buf[0] == ' ') {
buf = eol + 1;
continue; continue;
} }
h += strlen(field); /* Skip until we find the field we're after */
eol = strchr(h, '\n'); if (git__prefixcmp(buf, field)) {
if (h[0] != ' ') { buf = eol + 1;
buf = h;
continue; continue;
} }
if (!eol)
goto malformed;
h++; /* skip the SP */ buf += strlen(field);
/* Check that we're not matching a prefix but the field itself */
if (buf[0] != ' ') {
buf = eol + 1;
continue;
}
git_buf_put(out, h, eol - h); buf++; /* skip the SP */
git_buf_put(out, buf, eol - buf);
if (git_buf_oom(out)) if (git_buf_oom(out))
goto oom; goto oom;
/* If the next line starts with SP, it's multi-line, we must continue */ /* If the next line starts with SP, it's multi-line, we must continue */
while (eol[1] == ' ') { while (eol[1] == ' ') {
git_buf_putc(out, '\n'); git_buf_putc(out, '\n');
h = eol + 2; buf = eol + 2;
eol = strchr(h, '\n'); eol = strchr(buf, '\n');
if (!eol) if (!eol)
goto malformed; goto malformed;
git_buf_put(out, h, eol - h); git_buf_put(out, buf, eol - buf);
} }
if (git_buf_oom(out)) if (git_buf_oom(out))
@ -607,6 +611,7 @@ int git_commit_header_field(git_buf *out, const git_commit *commit, const char *
return 0; return 0;
} }
giterr_set(GITERR_OBJECT, "no such field '%s'", field);
return GIT_ENOTFOUND; return GIT_ENOTFOUND;
malformed: malformed:

4
tests/commit/parse.c
View File

@ -443,6 +443,10 @@ cpxtDQQMGYFpXK/71stq\n\
cl_git_pass(parse_commit(&commit, passing_commit_cases[4])); cl_git_pass(parse_commit(&commit, passing_commit_cases[4]));
cl_git_pass(git_commit_header_field(&buf, commit, "tree"));
cl_assert_equal_s("6b79e22d69bf46e289df0345a14ca059dfc9bdf6", buf.ptr);
git_buf_clear(&buf);
cl_git_pass(git_commit_header_field(&buf, commit, "parent")); cl_git_pass(git_commit_header_field(&buf, commit, "parent"));
cl_assert_equal_s("34734e478d6cf50c27c9d69026d93974d052c454", buf.ptr); cl_assert_equal_s("34734e478d6cf50c27c9d69026d93974d052c454", buf.ptr);
git_buf_clear(&buf); git_buf_clear(&buf);