Re: Problem with git-apply?

From: Kevin Shanahan <kmshanah@disenchant.net>
Date: Nov 4, 2006, 10:49 UTC
Message-ID: <20061104104913.GD19667@cubit>
In-Reply-To: <7vu01f34bo.fsf@assigned-by-dhcp.cox.net>

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.

Show 22 quoted lines

> ---
> 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)