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

apply: handle empty patches

Browse Source 
When a patch is empty, simply copy the source into the destination.
This commit is contained in:
Edward Thomson 2015-06-17 06:03:01 -07:00 committed by Edward Thomson
parent d34f68261e
commit 0004386f29
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/apply.c
View File

@ -262,7 +262,10 @@ int git_apply__patch(
patch->nfile.file->mode : GIT_FILEMODE_BLOB; patch->nfile.file->mode : GIT_FILEMODE_BLOB;
} }
if ((error = apply_hunks(contents_out, source, source_len, patch)) < 0) /* If the patch is empty, simply keep the source unchanged */
if (patch->hunks.size == 0)
git_buf_put(contents_out, source, source_len);
else if ((error = apply_hunks(contents_out, source, source_len, patch)) < 0)
goto done; goto done;
if (patch->delta->status == GIT_DELTA_DELETED && if (patch->delta->status == GIT_DELTA_DELETED &&

8
tests/apply/fromdiff.c
View File

@ -174,3 +174,11 @@ void test_apply_fromdiff__delete(void)
NULL, NULL, NULL, NULL,
PATCH_DELETE_ORIGINAL, NULL)); PATCH_DELETE_ORIGINAL, NULL));
} }
void test_apply_fromdiff__no_change(void)
{
cl_git_pass(apply_buf(
FILE_ORIGINAL, "file.txt",
FILE_ORIGINAL, "file.txt",
"", NULL));
}