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

patch: zero id and abbrev length for empty files

Browse Source
This commit is contained in:
Edward Thomson 2016-04-25 16:32:30 -04:00
parent 33ae876239
commit 853e585fb1
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/patch_parse.c
View File

@ -933,20 +933,32 @@ static int check_filenames(git_patch_parsed *patch)
static int check_patch(git_patch_parsed *patch) static int check_patch(git_patch_parsed *patch)
{ {
git_diff_delta *delta = patch->base.delta;
if (check_filenames(patch) < 0) if (check_filenames(patch) < 0)
return -1; return -1;
if (patch->base.delta->old_file.path && if (delta->old_file.path &&
patch->base.delta->status != GIT_DELTA_DELETED && delta->status != GIT_DELTA_DELETED &&
!patch->base.delta->new_file.mode) !delta->new_file.mode)
patch->base.delta->new_file.mode = patch->base.delta->old_file.mode; delta->new_file.mode = delta->old_file.mode;
if (patch->base.delta->status == GIT_DELTA_MODIFIED && if (delta->status == GIT_DELTA_MODIFIED &&
!(patch->base.delta->flags & GIT_DIFF_FLAG_BINARY) && !(delta->flags & GIT_DIFF_FLAG_BINARY) &&
patch->base.delta->new_file.mode == patch->base.delta->old_file.mode && delta->new_file.mode == delta->old_file.mode &&
git_array_size(patch->base.hunks) == 0) git_array_size(patch->base.hunks) == 0)
return parse_err("patch with no hunks"); return parse_err("patch with no hunks");
if (delta->status == GIT_DELTA_ADDED) {
memset(&delta->old_file.id, 0x0, sizeof(git_oid));
delta->old_file.id_abbrev = 0;
}
if (delta->status == GIT_DELTA_DELETED) {
memset(&delta->new_file.id, 0x0, sizeof(git_oid));
delta->new_file.id_abbrev = 0;
}
return 0; return 0;
} }