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

Re: [PATCH v7 19/33] refs: allow log-only updates

From
David Turner <dturner@twopensource.com>
Date
Apr 25, 2016, 16:46 UTC
Message-ID
<1461602814.25914.4.camel@twopensource.com>
In-Reply-To
<5718E0FC.7090501@alum.mit.edu>
On Thu, 2016-04-21 at 16:17 +0200, Michael Haggerty wrote:
Show 64 quoted lines
> On 03/01/2016 01:52 AM, David Turner wrote:
> > The refs infrastructure learns about log-only ref updates, which
> > only
> > update the reflog.  Later, we will use this to separate symbolic
> > reference resolution from ref updating.
> > 
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > Signed-off-by: Junio C Hamano <gitster@pobox.com>
> > ---
> >  refs/files-backend.c | 15 ++++++++++-----
> >  refs/refs-internal.h |  7 +++++++
> >  2 files changed, 17 insertions(+), 5 deletions(-)
> > 
> > diff --git a/refs/files-backend.c b/refs/files-backend.c
> > index 1f565cb..189b86e 100644
> > --- a/refs/files-backend.c
> > +++ b/refs/files-backend.c
> > @@ -2702,7 +2702,7 @@ static int commit_ref_update(struct ref_lock
> > *lock,
> >  			}
> >  		}
> >  	}
> > -	if (commit_ref(lock)) {
> > +	if (!(flags & REF_LOG_ONLY) && commit_ref(lock)) {
> >  		error("Couldn't set %s", lock->ref_name);
> >  		unlock_ref(lock);
> >  		return -1;
> > @@ -3056,7 +3056,8 @@ static int files_transaction_commit(struct
> > ref_transaction *transaction,
> >  			goto cleanup;
> >  		}
> >  		if ((update->flags & REF_HAVE_NEW) &&
> > -		    !(update->flags & REF_DELETING)) {
> > +		    !(update->flags & REF_DELETING) &&
> > +		    !(update->flags & REF_LOG_ONLY)) {
> >  			int overwriting_symref = ((update->type &
> > REF_ISSYMREF) &&
> >  						  (update->flags &
> > REF_NODEREF));
> >  
> > @@ -3086,7 +3087,9 @@ static int files_transaction_commit(struct
> > ref_transaction *transaction,
> >  				update->flags |= REF_NEEDS_COMMIT;
> >  			}
> >  		}
> > -		if (!(update->flags & REF_NEEDS_COMMIT)) {
> > +
> > +		if (!(update->flags & REF_LOG_ONLY) &&
> > +		    !(update->flags & REF_NEEDS_COMMIT)) {
> 
> I was just going over this series again, and I think this hunk is
> incorrect. If REF_LOG_ONLY, we created and opened the lockfile. And
> we
> didn't call write_ref_to_logfile(), so the lockfile is still open.
> That
> means that we want to call close_ref() here to free up the file
> descriptor. (Note that close_ref() closes the lockfile but doesn't
> release the lock. That is done further down by unlock_ref().)
> 
> So I think this hunk should be omitted.
> 
> I realize that this patch series is obsolete, so there is no need to
> re-submit. I just wanted to get a sanity check as I implement a new
> version of this patch that I'm not misunderstanding something.

I think your logic seems sound, but if you're going to change this, please make sure tests still pass -- as you know, this area is something of a minefield.

Previous: Michael HaggertyNext: David Turner
Message 34 of 57 in “refs backend”
  1. 00/33 refs backendDavid Turner, Mar 1, 2016
  2. 01/33 setup: call setup_git_directory_gently before accessing refsDavid Turner, Mar 1, 2016
  3. Jeff KingMar 1, 2016
  4. David TurnerMar 1, 2016
  5. David TurnerMar 2, 2016
  6. Jeff KingMar 2, 2016
  7. 02/33 refs: move head_ref{,_submodule} to the common codeDavid Turner, Mar 1, 2016
  8. 03/33 refs: move for_each_*ref* functions into common codeDavid Turner, Mar 1, 2016
  9. 04/33 files-backend: break out ref readingDavid Turner, Mar 1, 2016
  10. Michael HaggertyMar 20, 2016
  11. Michael HaggertyMar 22, 2016
  12. Michael HaggertyMar 23, 2016
  13. 05/33 refs: move resolve_ref_unsafe into common codeDavid Turner, Mar 1, 2016
  14. 06/33 refs: add a backend method structure with transaction functionsDavid Turner, Mar 1, 2016
  15. 07/33 refs: add methods for misc ref operationsDavid Turner, Mar 1, 2016
  16. 08/33 refs: add method for do_for_each_refDavid Turner, Mar 1, 2016
  17. 09/33 refs: reduce the visibility of do_for_each_ref()David Turner, Mar 1, 2016
  18. Michael HaggertyMar 24, 2016
  19. David TurnerMar 24, 2016
  20. 10/33 refs: add do_for_each_per_worktree_refDavid Turner, Mar 1, 2016
  21. 11/33 refs: add methods for reflogDavid Turner, Mar 1, 2016
  22. 12/33 refs: add method for initial ref transaction commitDavid Turner, Mar 1, 2016
  23. 13/33 refs: add method for delete_refsDavid Turner, Mar 1, 2016
  24. 14/33 refs: add methods to init refs dbDavid Turner, Mar 1, 2016
  25. Michael HaggertyMar 24, 2016
  26. David TurnerMar 24, 2016
  27. 15/33 refs: add method to rename refsDavid Turner, Mar 1, 2016
  28. 16/33 refs: handle non-normal ref renamesDavid Turner, Mar 1, 2016
  29. 17/33 refs: make lock genericDavid Turner, Mar 1, 2016
  30. Michael HaggertyMar 24, 2016
  31. 18/33 refs: move duplicate check to common codeDavid Turner, Mar 1, 2016
  32. 19/33 refs: allow log-only updatesDavid Turner, Mar 1, 2016
  33. Michael HaggertyApr 21, 2016
  34. David TurnerApr 25, 2016
  35. 20/33 refs: don't dereference on renameDavid Turner, Mar 1, 2016
  36. 21/33 refs: on symref reflog expire, lock symref not referrentDavid Turner, Mar 1, 2016
  37. 22/33 refs: resolve symbolic refs firstDavid Turner, Mar 1, 2016
  38. 23/33 refs: always handle non-normal refs in files backendDavid Turner, Mar 1, 2016
  39. 24/33 init: allow alternate ref strorage to be set for new reposDavid Turner, Mar 1, 2016
  40. 25/33 refs: check submodules' ref storage configDavid Turner, Mar 1, 2016
  41. 26/33 clone: allow ref storage backend to be set for cloneDavid Turner, Mar 1, 2016
  42. 27/33 svn: learn ref-storage argumentDavid Turner, Mar 1, 2016
  43. 28/33 refs: register ref storage backendsDavid Turner, Mar 1, 2016
  44. 29/33 setup: configure ref storage on setupDavid Turner, Mar 1, 2016
  45. Jeff KingMar 1, 2016
  46. Jeff KingMar 1, 2016
  47. Ramsay JonesMar 1, 2016
  48. David TurnerMar 1, 2016
  49. 30/33 refs: break out resolve_ref_unsafe_submoduleDavid Turner, Mar 1, 2016
  50. Ramsay JonesMar 1, 2016
  51. David TurnerMar 1, 2016
  52. 31/33 refs: add LMDB refs storage backendDavid Turner, Mar 1, 2016
  53. Duy NguyenMar 1, 2016
  54. David TurnerMar 1, 2016
  55. Duy NguyenMar 1, 2016
  56. 32/33 refs: tests for lmdb backendDavid Turner, Mar 1, 2016
  57. 33/33 tests: add ref-storage argumentDavid Turner, Mar 1, 2016

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.