git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 08/42] refs.c: change ref_transaction_update() to do error checking and return status

From
Ronnie Sahlberg <sahlberg@google.com>
Date
May 5, 2014, 23:09 UTC
Message-ID
<CAL=YDW=YYHGMsVSUsUKZeWwQ=ScPx66U72tcj8GNApnSopi6Uw@mail.gmail.com>
In-Reply-To
<53678D41.8010100@alum.mit.edu>
Thanks!
On Mon, May 5, 2014 at 6:08 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
Show 9 quoted lines
> On 05/01/2014 10:37 PM, Ronnie Sahlberg wrote:
>> Update ref_transaction_update() do some basic error checking and return
>> true on error. Update all callers to check ref_transaction_update() for error.
>> There are currently no conditions in _update that will return error but there
>> will be in the future.
>
> I would change s/true/non-zero/, because error return values are not
> just boolean values; the error values sometimes encode the type of error
> that occurred.
Done.
Show 59 quoted lines
>
>>
>> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
>> ---
>>  builtin/update-ref.c | 10 ++++++----
>>  refs.c               |  9 +++++++--
>>  refs.h               | 10 +++++-----
>>  3 files changed, 18 insertions(+), 11 deletions(-)
>>
>> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
>> index 2bef2a0..59c4d6b 100644
>> --- a/builtin/update-ref.c
>> +++ b/builtin/update-ref.c
>> @@ -197,8 +197,9 @@ static const char *parse_cmd_update(struct strbuf *input, const char *next)
>>       if (*next != line_termination)
>>               die("update %s: extra input: %s", refname, next);
>>
>> -     ref_transaction_update(transaction, refname, new_sha1, old_sha1,
>> -                            update_flags, have_old);
>> +     if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
>> +                                update_flags, have_old))
>> +             die("update %s: failed", refname);
>>
>>       update_flags = 0;
>>       free(refname);
>> @@ -286,8 +287,9 @@ static const char *parse_cmd_verify(struct strbuf *input, const char *next)
>>       if (*next != line_termination)
>>               die("verify %s: extra input: %s", refname, next);
>>
>> -     ref_transaction_update(transaction, refname, new_sha1, old_sha1,
>> -                            update_flags, have_old);
>> +     if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
>> +                                update_flags, have_old))
>> +             die("failed transaction update for %s", refname);
>>
>>       update_flags = 0;
>>       free(refname);
>> diff --git a/refs.c b/refs.c
>> index 308e13e..1a903fb 100644
>> --- a/refs.c
>> +++ b/refs.c
>> @@ -3333,19 +3333,24 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
>>       return update;
>>  }
>>
>> -void ref_transaction_update(struct ref_transaction *transaction,
>> +int ref_transaction_update(struct ref_transaction *transaction,
>>                           const char *refname,
>>                           const unsigned char *new_sha1,
>>                           const unsigned char *old_sha1,
>>                           int flags, int have_old)
>>  {
>> -     struct ref_update *update = add_update(transaction, refname);
>> +     struct ref_update *update;
>> +
>> +     if (have_old && !old_sha1)
>> +             die("have_old is true but old_sha1 is NULL");
>
> This new check is orthogonal to the rest of the patch, isn't it?
Yes.

I have updated the commit message to mention that we also check and die(BUG:...) for this condition.

Show 22 quoted lines
>
>>
>> +     update = add_update(transaction, refname);
>>       hashcpy(update->new_sha1, new_sha1);
>>       update->flags = flags;
>>       update->have_old = have_old;
>>       if (have_old)
>>               hashcpy(update->old_sha1, old_sha1);
>> +     return 0;
>>  }
>>
>>  void ref_transaction_create(struct ref_transaction *transaction,
>> diff --git a/refs.h b/refs.h
>> index bc7715e..0364a3e 100644
>> --- a/refs.h
>> +++ b/refs.h
>> @@ -237,11 +237,11 @@ void ref_transaction_rollback(struct ref_transaction *transaction);
>>   * that the reference should have had before the update, or zeros if
>>   * it must not have existed beforehand.
>>   */
>
> Please update the docstring above to explain the return value.
Done.
Show 22 quoted lines
>
>> -void ref_transaction_update(struct ref_transaction *transaction,
>> -                         const char *refname,
>> -                         const unsigned char *new_sha1,
>> -                         const unsigned char *old_sha1,
>> -                         int flags, int have_old);
>> +int ref_transaction_update(struct ref_transaction *transaction,
>> +                        const char *refname,
>> +                        const unsigned char *new_sha1,
>> +                        const unsigned char *old_sha1,
>> +                        int flags, int have_old);
>>
>>  /*
>>   * Add a reference creation to transaction.  new_sha1 is the value
>>
>
> Michael
>
> --
> Michael Haggerty
> mhagger@alum.mit.edu
> http://softwareswirl.blogspot.com/
Previous: Michael HaggertyNext: Jonathan Nieder
Message 22 of 78 in “Use ref transactions for all ref updates”
  1. 00/42 Use ref transactions for all ref updatesRonnie Sahlberg, May 1, 2014
  2. 01/42 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, May 1, 2014
  3. 02/42 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, May 1, 2014
  4. Jonathan NiederMay 13, 2014
  5. Ronnie SahlbergMay 13, 2014
  6. Ronnie SahlbergMay 14, 2014
  7. 03/42 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, May 1, 2014
  8. Jonathan NiederMay 13, 2014
  9. Ronnie SahlbergMay 14, 2014
  10. 04/42 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, May 1, 2014
  11. Jonathan NiederMay 14, 2014
  12. Ronnie SahlbergMay 14, 2014
  13. 05/42 update-ref.c: log transaction error from the update_refRonnie Sahlberg, May 1, 2014
  14. Jonathan NiederMay 14, 2014
  15. Ronnie SahlbergMay 15, 2014
  16. 06/42 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, May 1, 2014
  17. Jonathan NiederMay 14, 2014
  18. 07/42 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, May 1, 2014
  19. Jonathan NiederMay 14, 2014
  20. 08/42 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, May 1, 2014
  21. Michael HaggertyMay 5, 2014
  22. Ronnie SahlbergMay 5, 2014
  23. Jonathan NiederMay 14, 2014
  24. Ronnie SahlbergMay 15, 2014
  25. 09/42 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, May 1, 2014
  26. Jonathan NiederMay 15, 2014
  27. Ronnie SahlbergMay 15, 2014
  28. Jonathan NiederMay 15, 2014
  29. 10/42 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, May 1, 2014
  30. Jonathan NiederMay 15, 2014
  31. Ronnie SahlbergMay 15, 2014
  32. 11/42 tag.c: use ref transactions when doing updatesRonnie Sahlberg, May 1, 2014
  33. Jonathan NiederMay 15, 2014
  34. Ronnie SahlbergMay 15, 2014
  35. Jonathan NiederMay 15, 2014
  36. 12/42 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, May 1, 2014
  37. Jonathan NiederMay 15, 2014
  38. Ronnie SahlbergMay 15, 2014
  39. 13/42 commit.c: use ref transactions for updatesRonnie Sahlberg, May 1, 2014
  40. Jonathan NiederMay 15, 2014
  41. Ronnie SahlbergMay 15, 2014
  42. 14/42 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, May 1, 2014
  43. Jonathan NiederMay 15, 2014
  44. 15/42 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, May 1, 2014
  45. 16/42 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, May 1, 2014
  46. 17/42 refs.c: change update_ref to use a transactionRonnie Sahlberg, May 1, 2014
  47. 18/42 refs.c: free the transaction before returning when number of updates is 0Ronnie Sahlberg, May 1, 2014
  48. 19/42 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, May 1, 2014
  49. 20/42 fetch.c: clear errno before calling functions that might set itRonnie Sahlberg, May 1, 2014
  50. Eric SunshineMay 2, 2014
  51. Ronnie SahlbergMay 2, 2014
  52. 21/42 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, May 1, 2014
  53. 22/42 fetch.c: use a single ref transaction for all ref updatesRonnie Sahlberg, May 1, 2014
  54. 23/42 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, May 1, 2014
  55. 24/42 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, May 1, 2014
  56. 25/42 walker.c: use ref transaction for ref updatesRonnie Sahlberg, May 1, 2014
  57. 26/42 refs.c: make write_ref_sha1 staticRonnie Sahlberg, May 1, 2014
  58. 27/42 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, May 1, 2014
  59. 28/42 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, May 1, 2014
  60. 29/42 refs.c: remove the update_ref_lock functionRonnie Sahlberg, May 1, 2014
  61. 30/42 refs.c: remove the update_ref_write functionRonnie Sahlberg, May 1, 2014
  62. 31/42 refs.c: remove lock_ref_sha1Ronnie Sahlberg, May 1, 2014
  63. 32/42 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, May 1, 2014
  64. 33/42 refs.c: make delete_ref use a transactionRonnie Sahlberg, May 1, 2014
  65. 34/42 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, May 1, 2014
  66. 35/42 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, May 1, 2014
  67. 36/42 refs.c: pack all refs before we start to rename a refRonnie Sahlberg, May 1, 2014
  68. 37/42 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, May 1, 2014
  69. 38/42 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, May 1, 2014
  70. 39/42 refs.c: add a new flag for transaction delete for refs we know are packed onlyRonnie Sahlberg, May 1, 2014
  71. 40/42 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, May 1, 2014
  72. Eric SunshineMay 2, 2014
  73. Ronnie SahlbergMay 2, 2014
  74. 41/42 refs.c: make rename_ref use a transactionRonnie Sahlberg, May 1, 2014
  75. 42/42 refs.c: remove forward declaraion of write_ref_sha1Ronnie Sahlberg, May 1, 2014
  76. Michael HaggertyMay 5, 2014
  77. Ronnie SahlbergMay 5, 2014
  78. Jonathan NiederMay 13, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.