Christian Couder <christian.cou...@gmail.com> writes:
> While at it put an 'else' on the same line as the previous '}'.
>
> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
> ---
> builtin/apply.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 42c610e..465f954 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -931,22 +931,19 @@ static char *gitdiff_verify_name(const char *line, int
> isnull, char *orig_name,
> return find_name(line, NULL, p_value, TERM_TAB);
>
> if (orig_name) {
> - int len;
> - const char *name;
> + int len = strlen(orig_name);
> char *another;
> - name = orig_name;
> - len = strlen(name);
> if (isnull)
> - die(_("git apply: bad git-diff - expected /dev/null,
> got %s on line %d"), name, linenr);
> + die(_("git apply: bad git-diff - expected /dev/null,
> got %s on line %d"),
> + orig_name, linenr);
> another = find_name(line, NULL, p_value, TERM_TAB);
> - if (!another || memcmp(another, name, len + 1))
> + if (!another || memcmp(another, orig_name, len + 1))
> die((side == DIFF_NEW_NAME) ?
> _("git apply: bad git-diff - inconsistent new
> filename on line %d") :
> _("git apply: bad git-diff - inconsistent old
> filename on line %d"), linenr);
> free(another);
> return orig_name;
> - }
> - else {
> + } else {
> /* expect "/dev/null" */
> if (memcmp("/dev/null", line, 9) || line[9] != '\n')
> die(_("git apply: bad git-diff - expected /dev/null on
> line %d"), linenr);
Looks correct; back when 1e3f6b6e (git-apply: more consistency
checks on gitdiff filenames, 2005-05-23) introduced this function,
the variable "name" was in the outer scope, and a subsequent update
narrowed its scope at ea56188a (Update git-apply to use C-style
quoting for funny pathnames., 2005-10-16) but it could have removed
the variable at the same time.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
