public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Cc: mhagger@alum•mit.edu, Ronnie Sahlberg <sahlberg@google•com>
Subject: Re* [PATCH v3 04/14] refs.c: add a new update_type field to ref_update
Date: Wed, 18 Jun 2014 14:10:26 -0700	[thread overview]
Message-ID: <xmqqbntpj54t.fsf_-_@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqfvj2hs5g.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 18 Jun 2014 13:36:11 -0700")

Junio C Hamano <gitster@pobox•com> writes:

> Ronnie Sahlberg <sahlberg@google•com> writes:
>
>> Add a field that describes what type of update this refers to. For now
>> the only type is UPDATE_SHA1 but we will soon add more types.
>>
>> Signed-off-by: Ronnie Sahlberg <sahlberg@google•com>
>> ---
>>  refs.c | 25 +++++++++++++++++++++----
>>  1 file changed, 21 insertions(+), 4 deletions(-)
>>
>> diff --git a/refs.c b/refs.c
>> index 4e3d4c3..4129de6 100644
>> --- a/refs.c
>> +++ b/refs.c
>> @@ -3374,6 +3374,10 @@ int for_each_reflog(each_ref_fn fn, void *cb_data)
>>  	return retval;
>>  }
>>  
>> +enum transaction_update_type {
>> +       UPDATE_SHA1 = 0,
>
> indent with SP?
>
> Unlike an array initialisation, e.g.
>
> 	int foo[] = { 1,2,3,4,5, };
>
> some compilers we support complain if enum definition ends with a
> trailing comma.

I do recall we had fixes to drop the comma after the last element in
enum definition in the past, in response real compilation breakages
on some platforms.  But there is a curious thing:

    git grep -A<somenumber> 'enum ' master -- \*.c

tells me that builtin/clean.c would fail to compile for those folks.

Here is an off-topic "fix" that may no longer be needed.

 builtin/clean.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/clean.c b/builtin/clean.c
index 9a91515..27701d2 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -48,7 +48,7 @@ enum color_clean {
 	CLEAN_COLOR_PROMPT = 2,
 	CLEAN_COLOR_HEADER = 3,
 	CLEAN_COLOR_HELP = 4,
-	CLEAN_COLOR_ERROR = 5,
+	CLEAN_COLOR_ERROR = 5
 };
 
 #define MENU_OPTS_SINGLETON		01

  reply	other threads:[~2014-06-18 21:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-18 17:08 [PATCH v3 00/14] ref-transactions-reflog Ronnie Sahlberg
2014-06-18 17:08 ` [PATCH v3 01/14] refs.c make ref_transaction_create a wrapper to ref_transaction_update Ronnie Sahlberg
2014-06-18 20:34   ` Junio C Hamano
2014-06-18 17:08 ` [PATCH v3 02/14] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-06-18 17:08 ` [PATCH v3 03/14] refs.c: rename the transaction functions Ronnie Sahlberg
2014-06-18 17:08 ` [PATCH v3 04/14] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-06-18 20:36   ` Junio C Hamano
2014-06-18 21:10     ` Junio C Hamano [this message]
2014-07-02 18:27       ` Re* " Ronnie Sahlberg
2014-06-18 17:08 ` [PATCH v3 05/14] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-06-18 17:08 ` [PATCH v3 06/14] lockfile.c: make hold_lock_file_for_append preserve meaningful errno Ronnie Sahlberg
2014-06-18 17:08 ` [PATCH v3 07/14] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 08/14] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 09/14] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 10/14] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 11/14] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 12/14] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 13/14] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-06-18 17:09 ` [PATCH v3 14/14] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqbntpj54t.fsf_-_@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=mhagger@alum$(echo .)mit.edu \
    --cc=sahlberg@google$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox