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

patch_parse: use names from diff --git header

Browse Source 
When a text file is added or deleted, use the file names from the
`diff --git` header instead of the `---` or `+++` lines.  This is
for compatibility with git.
This commit is contained in:
Edward Thomson 2015-09-23 10:38:51 -04:00 committed by Edward Thomson
parent 1462c95a5d
commit 28f704433b
2 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/diff_print.c
View File

@ -282,7 +282,6 @@ static int diff_print_oid_range(
git_oid_tostr(start_oid, oid_strlen, &delta->old_file.id); git_oid_tostr(start_oid, oid_strlen, &delta->old_file.id);
git_oid_tostr(end_oid, oid_strlen, &delta->new_file.id); git_oid_tostr(end_oid, oid_strlen, &delta->new_file.id);
/* TODO: Match git diff more closely */
if (delta->old_file.mode == delta->new_file.mode) { if (delta->old_file.mode == delta->new_file.mode) {
git_buf_printf(out, "index %s..%s %o\n", git_buf_printf(out, "index %s..%s %o\n",
start_oid, end_oid, delta->old_file.mode); start_oid, end_oid, delta->old_file.mode);

61
src/patch_parse.c
View File

@ -628,6 +628,49 @@ done:
return error; return error;
} }
static int check_filenames(
git_patch_parsed *patch,
patch_parse_ctx *ctx)
{
/* For modechange only patches, it does not include filenames;
* instead we need to use the paths in the diff --git header.
*/
if (!patch->base.delta->old_file.path &&
!patch->base.delta->new_file.path) {
if (!ctx->header_old_path || !ctx->header_new_path)
return parse_err("git diff header lacks old / new paths");
patch->base.delta->old_file.path = ctx->header_old_path;
ctx->header_old_path = NULL;
patch->base.delta->new_file.path = ctx->header_new_path;
ctx->header_new_path = NULL;
}
/* For additions that have a `diff --git` header, set the old path
* to the path from the header, not `/dev/null`.
*/
if (patch->base.delta->status == GIT_DELTA_ADDED &&
ctx->header_old_path) {
git__free((char *)patch->base.delta->old_file.path);
patch->base.delta->old_file.path = ctx->header_old_path;
ctx->header_old_path = NULL;
}
/* For deletes, set the new path to the path from the
* `diff --git` header, not `/dev/null`.
*/
if (patch->base.delta->status == GIT_DELTA_DELETED &&
ctx->header_new_path) {
git__free((char *)patch->base.delta->new_file.path);
patch->base.delta->new_file.path = ctx->header_new_path;
ctx->header_new_path = NULL;
}
return 0;
}
static int parsed_patch_header( static int parsed_patch_header(
git_patch_parsed *patch, git_patch_parsed *patch,
patch_parse_ctx *ctx) patch_parse_ctx *ctx)
@ -667,23 +710,7 @@ static int parsed_patch_header(
if ((error = parse_header_git(patch, ctx)) < 0) if ((error = parse_header_git(patch, ctx)) < 0)
goto done; goto done;
/* For modechange only patches, it does not include filenames; error = check_filenames(patch, ctx);
* instead we need to use the paths in the diff --git header.
*/
if (!patch->base.delta->old_file.path &&
!patch->base.delta->new_file.path) {
if (!ctx->header_old_path || !ctx->header_new_path) {
error = parse_err("git diff header lacks old / new paths");
goto done;
}
patch->base.delta->old_file.path = ctx->header_old_path;
ctx->header_old_path = NULL;
patch->base.delta->new_file.path = ctx->header_new_path;
ctx->header_new_path = NULL;
}
goto done; goto done;
} }