Re: [PATCH v8 36/44] refs.c: pass the ref log message to _create/delete/update instead of _commit

From: Jonathan Nieder <jrnieder@gmail.com>
Date: May 21, 2014, 23:47 UTC
Message-ID: <20140521234717.GL12314@google.com>
In-Reply-To: <1400174999-26786-37-git-send-email-sahlberg@google.com>

Ronnie Sahlberg wrote:

> Change the reference transactions so that we pass the reflog message
> through to the create/delete/update function instead of the commit message.

Nice.

[...]

Show 10 quoted lines

> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -673,7 +673,6 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
> 			}
> 		}
> 	}
> -
> 	if (rc & STORE_REF_ERROR_DF_CONFLICT)
> 		error(_("some local refs could not be updated; try running\n"
> 		      " 'git remote prune %s' to remove any old, conflicting "

Stray whitespace change?

[...]

> --- a/refs.c
> +++ b/refs.c

[...]

Show 6 quoted lines

> @@ -3264,6 +3264,7 @@ struct ref_update {
>  	int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
>  	struct ref_lock *lock;
>  	int type;
> +	const char *msg;
>  	const char refname[FLEX_ARRAY];

Should be 'char *msg' since we own the memory (or perhaps a strbuf).

[...]

Show 8 quoted lines

> @@ -3297,9 +3298,10 @@ void ref_transaction_free(struct ref_transaction *transaction)
>  	if (!transaction)
>  		return;
>  
> -	for (i = 0; i < transaction->nr; i++)
> +	for (i = 0; i < transaction->nr; i++) {
> +	  free((char *)transaction->updates[i]->msg);
>  		free(transaction->updates[i]);

Whitespace?

No need to cast.

The rest of the patch looks good.

Thanks, Jonathan