Skip to content

G
git2
Commit 131cd9b1 by Patrick Steinhardt
Options

patch_parse: improve formatting

parent 8e4927a4
Showing with 12 additions and 18 deletions
src/patch_parse.c
...@@ -921,21 +921,15 @@ static int check_filenames(git_patch_parsed *patch) ...@@ -921,21 +921,15 @@ static int check_filenames(git_patch_parsed *patch)
return git_parse_err("missing old path"); return git_parse_err("missing old path");
/* Ensure (non-renamed) paths match */ /* Ensure (non-renamed) paths match */
if (check_header_names( if (check_header_names(patch->header_old_path, patch->old_path, "old", added) < 0 ||
patch->header_old_path, patch->old_path, "old", added) < 0 || check_header_names(patch->header_new_path, patch->new_path, "new", deleted) < 0)
check_header_names(
patch->header_new_path, patch->new_path, "new", deleted) < 0)
return -1; return -1;
prefixed_old = (!added && patch->old_path) ? patch->old_path : prefixed_old = (!added && patch->old_path) ? patch->old_path : patch->header_old_path;
patch->header_old_path; prefixed_new = (!deleted && patch->new_path) ? patch->new_path : patch->header_new_path;
prefixed_new = (!deleted && patch->new_path) ? patch->new_path :
patch->header_new_path;
if (check_prefix( if (check_prefix(&patch->old_prefix, &old_prefixlen, patch, prefixed_old) < 0 ||
&patch->old_prefix, &old_prefixlen, patch, prefixed_old) < 0 || check_prefix(&patch->new_prefix, &new_prefixlen, patch, prefixed_new) < 0)
check_prefix(
&patch->new_prefix, &new_prefixlen, patch, prefixed_new) < 0)
return -1; return -1;
/* Prefer the rename filenames as they are unambiguous and unprefixed */ /* Prefer the rename filenames as they are unambiguous and unprefixed */
...@@ -950,7 +944,7 @@ static int check_filenames(git_patch_parsed *patch) ...@@ -950,7 +944,7 @@ static int check_filenames(git_patch_parsed *patch)
patch->base.delta->new_file.path = prefixed_new + new_prefixlen; patch->base.delta->new_file.path = prefixed_new + new_prefixlen;
if (!patch->base.delta->old_file.path && if (!patch->base.delta->old_file.path &&
!patch->base.delta->new_file.path) !patch->base.delta->new_file.path)
return git_parse_err("git diff header lacks old / new paths"); return git_parse_err("git diff header lacks old / new paths");
return 0; return 0;
...@@ -964,14 +958,14 @@ static int check_patch(git_patch_parsed *patch) ...@@ -964,14 +958,14 @@ static int check_patch(git_patch_parsed *patch)
return -1; return -1;
if (delta->old_file.path && if (delta->old_file.path &&
delta->status != GIT_DELTA_DELETED && delta->status != GIT_DELTA_DELETED &&
!delta->new_file.mode) !delta->new_file.mode)
delta->new_file.mode = delta->old_file.mode; delta->new_file.mode = delta->old_file.mode;
if (delta->status == GIT_DELTA_MODIFIED && if (delta->status == GIT_DELTA_MODIFIED &&
!(delta->flags & GIT_DIFF_FLAG_BINARY) && !(delta->flags & GIT_DIFF_FLAG_BINARY) &&
delta->new_file.mode == 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 git_parse_err("patch with no hunks"); return git_parse_err("patch with no hunks");
if (delta->status == GIT_DELTA_ADDED) { if (delta->status == GIT_DELTA_ADDED) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment