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

[PATCH v2 00/17] Fixes and improvements for ref consistency checks

From
Patrick Steinhardt <ps@pks.im>
Date
Jan 12, 2026, 09:02 UTC
Message-ID
<20260112-pks-refs-verify-fixes-v2-0-2e9e453bd6c3@pks.im>
In-Reply-To
<20260109-pks-refs-verify-fixes-v1-0-3587dba18294@pks.im>
Hi,

this patch series contains a bunch of fixes and improvements for ref consistency checks. It is structured as follows:

  - Patches 1 to 4 contain a couple of cleanups for the consistency
    checks done by the "files" backend.
  - Patches 5 to 7 introduce checks for root refs for the "files"
    backend.
  - Patches 9 to 14 introduce infrastructure for shared checks with the
    "files" and "reftable" backend.
  - Patches 15 to 17 move some ref consistency checks that were still
    driven by git-fsck(1) into `git refs verify`.
Changes in v2:
  - Remove unused `errors_found` field.
  - Fix a commit message typo.
  - Fix a copy-paste error in a function comment.
  - Link to v1: https://lore.kernel.org/r/20260109-pks-refs-verify-fixes-v1-0-3587dba18294@pks.im
Thanks!
Patrick
---
Patrick Steinhardt (17):
      refs/files: simplify iterating through root refs
      refs/files: move fsck functions into global scope
      refs/files: remove `refs_check_dir` parameter
      refs/files: remove useless indirection
      refs/files: extract function to check single ref
      refs/files: improve error handling when verifying symrefs
      refs/files: perform consistency checks for root refs
      fsck: drop unused fields from `struct fsck_ref_report`
      refs/files: extract generic symref target checks
      refs/files: introduce function to perform normal ref checks
      refs/reftable: adapt includes to become consistent
      refs/reftable: extract function to retrieve backend for worktree
      refs/reftable: fix consistency checks with worktrees
      refs/reftable: introduce generic checks for refs
      builtin/fsck: move generic object ID checks into `refs_fsck()`
      builtin/fsck: move generic HEAD check into `refs_fsck()`
      builtin/fsck: drop `fsck_head_link()`
 Documentation/fsck-msgids.adoc |   6 ++
 builtin/fsck.c                 |  46 +--------
 fsck.c                         |   5 -
 fsck.h                         |   4 +-
 refs.c                         |  43 ++++++++
 refs.h                         |  18 ++++
 refs/files-backend.c           | 228 ++++++++++++++++++++++++-----------------
 refs/reftable-backend.c        | 167 ++++++++++++++++++++++--------
 t/t0602-reffiles-fsck.sh       |  30 ++++++
 t/t0614-reftable-fsck.sh       |  44 ++++++++
 t/t1450-fsck.sh                |  10 +-
 11 files changed, 414 insertions(+), 187 deletions(-)
Range-diff versus v1:
 1:  201451626d =  1:  21531efb05 refs/files: simplify iterating through root refs
 2:  88252f2b99 =  2:  861bd57d6e refs/files: move fsck functions into global scope
 3:  56d8ce2c85 =  3:  e06b8bdd23 refs/files: remove `refs_check_dir` parameter
 4:  ddf450134c =  4:  92992a522e refs/files: remove useless indirection
 5:  2d3ebf80fd =  5:  904fecf80e refs/files: extract function to check single ref
 6:  316dafeff8 =  6:  b5f5e86f1f refs/files: improve error handling when verifying symrefs
 7:  94a9b3d58b !  7:  d1abff98f8 refs/files: perform consistency checks for root refs
    @@ refs/files-backend.c: static int files_fsck_refs_dir(struct ref_store *ref_store
     +	struct worktree *wt;
     +	struct strbuf refname;
     +	struct strbuf path;
    -+	bool errors_found;
     +};
     +
     +static int files_fsck_root_ref(const char *refname, void *cb_data)
    @@ refs/files-backend.c: static int files_fsck_refs_dir(struct ref_store *ref_store
      	if (files_fsck_refs_dir(ref_store, o, wt) < 0)
      		ret = -1;
     +
    -+	if (for_each_root_ref(refs, files_fsck_root_ref, &data) < 0 ||
    -+	    data.errors_found)
    ++	if (for_each_root_ref(refs, files_fsck_root_ref, &data) < 0)
     +		ret = -1;
     +
      	if (refs->packed_ref_store->be->fsck(refs->packed_ref_store, o, wt) < 0)
 8:  a773fd65e9 =  8:  0b0e0e0033 fsck: drop unused fields from `struct fsck_ref_report`
 9:  12cf39ce8c !  9:  4bf249e530 refs/files: extract generic symref target checks
    @@ Commit message
     
         Reimplementing these checks for every single backend doesn't really make
         sense. Extract it into a generic `refs_fsck_symref()` function that can
    -    be used my other backends, as well. The "reftable" backend will be wired
    +    be used by other backends, as well. The "reftable" backend will be wired
         up in a subsequent commit.
     
         While at it, improve the consistency checks so that we don't complain
10:  9ae96c0acb ! 10:  5bd34fb53c refs/files: introduce function to perform normal ref checks
    @@ refs.h: int check_refname_format(const char *refname, int flags);
      struct fsck_ref_report;
      
     +/*
    -+ * Perform generic checks for a specific symref target. This function is
    ++ * Perform generic checks for a specific direct ref. This function is
     + * expected to be called by the ref backends for every symbolic ref.
     + */
     +int refs_fsck_ref(struct ref_store *refs, struct fsck_options *o,
11:  c2b0a1f517 = 11:  ca62b50abc refs/reftable: adapt includes to become consistent
12:  608b689d9e = 12:  66b5d6c981 refs/reftable: extract function to retrieve backend for worktree
13:  d39733206f = 13:  d31b7fb348 refs/reftable: fix consistency checks with worktrees
14:  37b8d22941 = 14:  eb960e66f2 refs/reftable: introduce generic checks for refs
15:  72b81062d2 = 15:  d0e2e3fe33 builtin/fsck: move generic object ID checks into `refs_fsck()`
16:  07a2403bc7 = 16:  029d02dd8a builtin/fsck: move generic HEAD check into `refs_fsck()`
17:  e944a0e430 = 17:  99eb06f153 builtin/fsck: drop `fsck_head_link()`

--- base-commit: d529f3a197364881746f558e5652f0236131eb86 change-id: 20260109-pks-refs-verify-fixes-1e47872317cf

Previous: Patrick SteinhardtNext: Patrick Steinhardt
Message 32 of 61 in “Fixes and improvements for ref consistency checks”
  1. 00/17 Fixes and improvements for ref consistency checksPatrick Steinhardt, Jan 9, 2026
  2. 01/17 refs/files: simplify iterating through root refsPatrick Steinhardt, Jan 9, 2026
  3. shejialuoJan 10, 2026
  4. 02/17 refs/files: move fsck functions into global scopePatrick Steinhardt, Jan 9, 2026
  5. 03/17 refs/files: remove `refs_check_dir` parameterPatrick Steinhardt, Jan 9, 2026
  6. 04/17 refs/files: remove useless indirectionPatrick Steinhardt, Jan 9, 2026
  7. 05/17 refs/files: extract function to check single refPatrick Steinhardt, Jan 9, 2026
  8. 06/17 refs/files: improve error handling when verifying symrefsPatrick Steinhardt, Jan 9, 2026
  9. shejialuoJan 10, 2026
  10. 07/17 refs/files: perform consistency checks for root refsPatrick Steinhardt, Jan 9, 2026
  11. shejialuoJan 10, 2026
  12. Patrick SteinhardtJan 12, 2026
  13. 08/17 fsck: drop unused fields from `struct fsck_ref_report`Patrick Steinhardt, Jan 9, 2026
  14. 09/17 refs/files: extract generic symref target checksPatrick Steinhardt, Jan 9, 2026
  15. shejialuoJan 10, 2026
  16. Patrick SteinhardtJan 12, 2026
  17. 10/17 refs/files: introduce function to perform normal ref checksPatrick Steinhardt, Jan 9, 2026
  18. shejialuoJan 10, 2026
  19. Patrick SteinhardtJan 12, 2026
  20. 11/17 refs/reftable: adapt includes to become consistentPatrick Steinhardt, Jan 9, 2026
  21. 12/17 refs/reftable: extract function to retrieve backend for worktreePatrick Steinhardt, Jan 9, 2026
  22. 13/17 refs/reftable: fix consistency checks with worktreesPatrick Steinhardt, Jan 9, 2026
  23. 14/17 refs/reftable: introduce generic checks for refsPatrick Steinhardt, Jan 9, 2026
  24. 15/17 builtin/fsck: move generic object ID checks into `refs_fsck()`Patrick Steinhardt, Jan 9, 2026
  25. 16/17 builtin/fsck: move generic HEAD check into `refs_fsck()`Patrick Steinhardt, Jan 9, 2026
  26. shejialuoJan 10, 2026
  27. Patrick SteinhardtJan 12, 2026
  28. shejialuoJan 15, 2026
  29. 17/17 builtin/fsck: drop `fsck_head_link()`Patrick Steinhardt, Jan 9, 2026
  30. shejialuoJan 10, 2026
  31. Patrick SteinhardtJan 12, 2026
  32. 00/17 Fixes and improvements for ref consistency checksPatrick Steinhardt, Jan 12, 2026
  33. 01/17 refs/files: simplify iterating through root refsPatrick Steinhardt, Jan 12, 2026
  34. Karthik NayakJan 12, 2026
  35. 02/17 refs/files: move fsck functions into global scopePatrick Steinhardt, Jan 12, 2026
  36. 03/17 refs/files: remove `refs_check_dir` parameterPatrick Steinhardt, Jan 12, 2026
  37. 04/17 refs/files: remove useless indirectionPatrick Steinhardt, Jan 12, 2026
  38. Karthik NayakJan 12, 2026
  39. 05/17 refs/files: extract function to check single refPatrick Steinhardt, Jan 12, 2026
  40. 06/17 refs/files: improve error handling when verifying symrefsPatrick Steinhardt, Jan 12, 2026
  41. 07/17 refs/files: perform consistency checks for root refsPatrick Steinhardt, Jan 12, 2026
  42. 08/17 fsck: drop unused fields from `struct fsck_ref_report`Patrick Steinhardt, Jan 12, 2026
  43. 09/17 refs/files: extract generic symref target checksPatrick Steinhardt, Jan 12, 2026
  44. 10/17 refs/files: introduce function to perform normal ref checksPatrick Steinhardt, Jan 12, 2026
  45. Karthik NayakJan 12, 2026
  46. Patrick SteinhardtJan 12, 2026
  47. Junio C HamanoJan 12, 2026
  48. Junio C HamanoJan 12, 2026
  49. Patrick SteinhardtJan 12, 2026
  50. 11/17 refs/reftable: adapt includes to become consistentPatrick Steinhardt, Jan 12, 2026
  51. 12/17 refs/reftable: extract function to retrieve backend for worktreePatrick Steinhardt, Jan 12, 2026
  52. 13/17 refs/reftable: fix consistency checks with worktreesPatrick Steinhardt, Jan 12, 2026
  53. Karthik NayakJan 12, 2026
  54. 14/17 refs/reftable: introduce generic checks for refsPatrick Steinhardt, Jan 12, 2026
  55. 15/17 builtin/fsck: move generic object ID checks into `refs_fsck()`Patrick Steinhardt, Jan 12, 2026
  56. 16/17 builtin/fsck: move generic HEAD check into `refs_fsck()`Patrick Steinhardt, Jan 12, 2026
  57. 17/17 builtin/fsck: drop `fsck_head_link()`Patrick Steinhardt, Jan 12, 2026
  58. Karthik NayakJan 12, 2026
  59. Patrick SteinhardtJan 12, 2026
  60. shejialuoJan 15, 2026
  61. Patrick SteinhardtJan 16, 2026

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.