Re: [PATCH 12/13] Build in merge

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 27, 2008, 11:56 UTC
Message-ID: <alpine.DEB.1.00.0806271255240.9925@racer>
In-Reply-To: <20080627010609.GJ29404@genesis.frugalware.org>

Hi,

On Fri, 27 Jun 2008, Miklos Vajna wrote:

Show 11 quoted lines

> diff --git a/builtin-merge.c b/builtin-merge.c
> index cc04d01..77de9e8 100644
> --- a/builtin-merge.c
> +++ b/builtin-merge.c
> @@ -836,9 +836,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
>  		/* Again the most common case of merging one remote. */
>  		struct strbuf msg;
>  		struct object *o;
> +		char hex[41];
> +
> +		memcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV), 41);

Maybe strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV)) would be more intuitive?

Ciao, Dscho