proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-22 15:18:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3160 from b4n/ident-same-as-git

Browse Source 
Fix ident replacement to match Git behavior
This commit is contained in:
Carlos Martín Nieto 2015-05-28 02:40:22 +02:00
commit c7f9412356
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ident.c
View File

@ -56,7 +56,7 @@ static int ident_insert_id(
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
need_size = (size_t)(id_start - from->ptr) + need_size = (size_t)(id_start - from->ptr) +
5 /* "$Id: " */ + GIT_OID_HEXSZ + 1 /* "$" */ + 5 /* "$Id: " */ + GIT_OID_HEXSZ + 2 /* " $" */ +
(size_t)(from_end - id_end); (size_t)(from_end - id_end);
if (git_buf_grow(to, need_size) < 0) if (git_buf_grow(to, need_size) < 0)
@ -65,7 +65,7 @@ static int ident_insert_id(
git_buf_set(to, from->ptr, (size_t)(id_start - from->ptr)); git_buf_set(to, from->ptr, (size_t)(id_start - from->ptr));
git_buf_put(to, "$Id: ", 5); git_buf_put(to, "$Id: ", 5);
git_buf_put(to, oid, GIT_OID_HEXSZ); git_buf_put(to, oid, GIT_OID_HEXSZ);
git_buf_putc(to, '$'); git_buf_put(to, " $", 2);
git_buf_put(to, id_end, (size_t)(from_end - id_end)); git_buf_put(to, id_end, (size_t)(from_end - id_end));
return git_buf_oom(to) ? -1 : 0; return git_buf_oom(to) ? -1 : 0;