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

Re: [PATCH v2 2/2] shallow.c: use '{commit,rollback}_shallow_file'

From
JTJonathan Tan <jonathantanmy@google.com>
Date
Apr 23, 2020, 18:09 UTC
Message-ID
<20200423180905.195407-1-jonathantanmy@google.com>
In-Reply-To
<296e70790d7a391d471554b0bc5a58e2a091ce88.1587601501.git.me@ttaylorr.com>
> Replace each instance of 'commit_lock_file' and 'rollback_lock_file'
> with 'commit_shallow_file' and 'rollback_shallow_file' when the lock
> being held is over the '.git/shallow' file.

I think Jonathan Nieder already covered 1/2 so I'll just close the loop on this patch. There was one potential issue in that a previous version of this patch also called reset_repository_shallow() in setup_alternate_shallow(), but this version does not. But after looking into it, this looks fine - setup_alternate_shallow() deals with a passed-in alternate_shallow_file variable, which is different from the r->parsed_objects->alternate_shallow_file that is_repository_shallow() uses to set the global variables. (I might have confused the two during earlier reviews.) Also, setup_alternate_shallow() is called either before any shallow processing (empirically demonstrating that no resetting is needed in this case, because it has been working), or right before a commit or rollback of the lock file (so the global variables are being reset anyway, so we do not need to call reset_repository_shallow()).

So,
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Previous: Jonathan NiederNext: Junio C Hamano
Message 19 of 32 in “shallow.c: use 'reset_repository_shallow' when appropriate”
  1. shallow.c: use 'reset_repository_shallow' when appropriateTaylor Blau, Apr 21, 2020
  2. Junio C HamanoApr 21, 2020
  3. Taylor BlauApr 21, 2020
  4. Junio C HamanoApr 21, 2020
  5. Taylor BlauApr 21, 2020
  6. Junio C HamanoApr 21, 2020
  7. Jonathan TanApr 22, 2020
  8. Jonathan TanApr 22, 2020
  9. Junio C HamanoApr 22, 2020
  10. Taylor BlauApr 23, 2020
  11. 0/2 shallow.c: reset shallow-ness after updatingTaylor Blau, Apr 23, 2020
  12. 1/2 t5537: use test_write_lines, indented heredocs for readabilityTaylor Blau, Apr 23, 2020
  13. Jonathan NiederApr 23, 2020
  14. Taylor BlauApr 24, 2020
  15. Jonathan NiederApr 24, 2020
  16. Junio C HamanoApr 24, 2020
  17. 2/2 shallow.c: use '{commit,rollback}_shallow_file'Taylor Blau, Apr 23, 2020
  18. Jonathan NiederApr 23, 2020
  19. Jonathan TanApr 23, 2020
  20. Junio C HamanoApr 23, 2020
  21. Taylor BlauApr 24, 2020
  22. Jonathan NiederJun 3, 2020
  23. Taylor BlauJun 3, 2020
  24. Taylor BlauJun 3, 2020
  25. Derrick StoleeJun 3, 2020
  26. Taylor BlauJun 3, 2020
  27. Jonathan NiederJun 3, 2020
  28. Jonathan NiederJun 3, 2020
  29. Taylor BlauJun 3, 2020
  30. Jonathan NiederJun 3, 2020
  31. Taylor BlauJun 4, 2020
  32. Junio C HamanoApr 23, 2020

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.