On Sat, Nov 04, 2006 at 02:15:55AM -0800, Junio C Hamano wrote:
> Actually it was a small problem in the patch parsing code. Can
> you give this a try?
Yes, this patch works for me.
Cheers,
Kev.
> ---
> diff --git a/builtin-apply.c b/builtin-apply.c
> index 11397f5..db7cdce 100644
> --- a/builtin-apply.c
> +++ b/builtin-apply.c
> @@ -1043,10 +1043,14 @@ static int parse_single_patch(char *line
> * then not having oldlines means the patch is creation,
> * and not having newlines means the patch is deletion.
> */
> - if (patch->is_new < 0 && !oldlines)
> + if (patch->is_new < 0 && !oldlines) {
> patch->is_new = 1;
> - if (patch->is_delete < 0 && !newlines)
> + patch->old_name = NULL;
> + }
> + if (patch->is_delete < 0 && !newlines) {
> patch->is_delete = 1;
> + patch->new_name = NULL;
> + }
> }
>
> if (0 < patch->is_new && oldlines)
>
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html