On Thu, Oct 23, 2014 at 10:42 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Ronnie Sahlberg <sahlberg@xxxxxxxxxx> writes:
>
>> Subject: Re: [PATCH 01/15] refs.c make ref_transaction_create a wrapper to ref_transaction_update
>
> Missing colon after "refs.c"
>
>> commit 03001144a015f81db5252005841bb78f57d62774 upstream.
>
> Huh?
>
>> The ref_transaction_update function can already be used to create refs by
>> passing null_sha1 as the old_sha1 parameter. Simplify by replacing
>> transaction_create with a thin wrapper.
>
> Nice code reduction.
>
>> Change-Id: I687dd47cc4f4e06766e8313b4fd1b07cd4a56c1a
>
> Please don't leak local housekeeping details into the official
> history.
Ah, Ok.
Do you want me to re-send the series with these lines deleted ?
>
>> Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
>> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
>> ---
>> refs.c | 27 ++-------------------------
>> 1 file changed, 2 insertions(+), 25 deletions(-)
>>
>> diff --git a/refs.c b/refs.c
>> index 0368ed4..ed0485e 100644
>> --- a/refs.c
>> +++ b/refs.c
>> @@ -3623,31 +3623,8 @@ int ref_transaction_create(struct ref_transaction *transaction,
>> int flags, const char *msg,
>> struct strbuf *err)
>> {
>> - struct ref_update *update;
>> -
>> - assert(err);
>> -
>> - if (transaction->state != REF_TRANSACTION_OPEN)
>> - die("BUG: create called for transaction that is not open");
>> -
>> - if (!new_sha1 || is_null_sha1(new_sha1))
>> - die("BUG: create ref with null new_sha1");
>> -
>> - if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
>> - strbuf_addf(err, "refusing to create ref with bad name %s",
>> - refname);
>> - return -1;
>> - }
>> -
>> - update = add_update(transaction, refname);
>> -
>> - hashcpy(update->new_sha1, new_sha1);
>> - hashclr(update->old_sha1);
>> - update->flags = flags;
>> - update->have_old = 1;
>> - if (msg)
>> - update->msg = xstrdup(msg);
>> - return 0;
>> + return ref_transaction_update(transaction, refname, new_sha1,
>> + null_sha1, flags, 1, msg, err);
>> }
>>
>> int ref_transaction_delete(struct ref_transaction *transaction,
--
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