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

Re: [PATCH 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 23, 2014, 17:43 UTC
Message-ID
<xmqqtx2usmvr.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1413919462-3458-3-git-send-email-sahlberg@google.com>
Ronnie Sahlberg <sahlberg@google.com> writes:
Show 9 quoted lines
> commit 0beeda259297c92d411ecc92fa508ec7cfd87cc5 upstream.
>
> Change-Id: I685291986e544a8dc14f94c73b6a7c6400acd9d2
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
>  refs.c | 22 ++--------------------
>  refs.h |  2 +-
>  2 files changed, 3 insertions(+), 21 deletions(-)
Nice code reduction.
Show 47 quoted lines
>
> diff --git a/refs.c b/refs.c
> index ed0485e..c607ab7 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3633,26 +3633,8 @@ int ref_transaction_delete(struct ref_transaction *transaction,
>  			   int flags, int have_old, const char *msg,
>  			   struct strbuf *err)
>  {
> -	struct ref_update *update;
> -
> -	assert(err);
> -
> -	if (transaction->state != REF_TRANSACTION_OPEN)
> -		die("BUG: delete called for transaction that is not open");
> -
> -	if (have_old && !old_sha1)
> -		die("BUG: have_old is true but old_sha1 is NULL");
> -
> -	update = add_update(transaction, refname);
> -	update->flags = flags;
> -	update->have_old = have_old;
> -	if (have_old) {
> -		assert(!is_null_sha1(old_sha1));
> -		hashcpy(update->old_sha1, old_sha1);
> -	}
> -	if (msg)
> -		update->msg = xstrdup(msg);
> -	return 0;
> +	return ref_transaction_update(transaction, refname, null_sha1,
> +				      old_sha1, flags, have_old, msg, err);
>  }
>  
>  int update_ref(const char *action, const char *refname,
> diff --git a/refs.h b/refs.h
> index 2bc3556..7d675b7 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -283,7 +283,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
>  
>  /*
>   * Add a reference update to transaction.  new_sha1 is the value that
> - * the reference should have after the update, or zeros if it should
> + * the reference should have after the update, or null_sha1 if it should
>   * be deleted.  If have_old is true, then old_sha1 holds the value
>   * that the reference should have had before the update, or zeros if
>   * it must not have existed beforehand.
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 8 of 28 in “ref-transactions-reflog”
  1. 00/15 ref-transactions-reflogRonnie Sahlberg, Oct 21, 2014
  2. 01/15 refs.c make ref_transaction_create a wrapper to ref_transaction_updateRonnie Sahlberg, Oct 21, 2014
  3. Junio C HamanoOct 23, 2014
  4. Ronnie SahlbergOct 23, 2014
  5. Junio C HamanoOct 23, 2014
  6. Junio C HamanoOct 28, 2014
  7. 02/15 refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg, Oct 21, 2014
  8. Junio C HamanoOct 23, 2014
  9. 03/15 refs.c: rename the transaction functionsRonnie Sahlberg, Oct 21, 2014
  10. 04/15 refs.c: add a new update_type field to ref_updateRonnie Sahlberg, Oct 21, 2014
  11. Junio C HamanoOct 23, 2014
  12. 05/15 refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg, Oct 21, 2014
  13. 06/15 copy.c: make copy_fd preserve meaningful errnoRonnie Sahlberg, Oct 21, 2014
  14. Junio C HamanoOct 23, 2014
  15. Ronnie SahlbergOct 23, 2014
  16. 07/15 refs.c: add a transaction function to append a reflog entryRonnie Sahlberg, Oct 21, 2014
  17. 08/15 refs.c: add a flag to allow reflog updates to truncate the logRonnie Sahlberg, Oct 21, 2014
  18. 09/15 refs.c: only write reflog update if msg is non-NULLRonnie Sahlberg, Oct 21, 2014
  19. Junio C HamanoOct 23, 2014
  20. Ronnie SahlbergOct 28, 2014
  21. 10/15 refs.c: allow multiple reflog updates during a single transactionRonnie Sahlberg, Oct 21, 2014
  22. Junio C HamanoOct 23, 2014
  23. Ronnie SahlbergOct 28, 2014
  24. 11/15 reflog.c: use a reflog transaction when writing during expireRonnie Sahlberg, Oct 21, 2014
  25. 12/15 refs.c: rename log_ref_setup to create_reflogRonnie Sahlberg, Oct 21, 2014
  26. 13/15 refs.c: make unlock_ref/close_ref/commit_ref staticRonnie Sahlberg, Oct 21, 2014
  27. 14/15 refs.c: remove lock_any_ref_for_updateRonnie Sahlberg, Oct 21, 2014
  28. 15/15 refs.c: allow deleting refs with a broken sha1Ronnie Sahlberg, Oct 21, 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.