git/list[1] front-page[2] threads[3] people[4] search[5] about
wed 2026-10-07 17:02 UTC

Re: [GSoC PATCH v2 2/4] pack-write: add helper to fill promisor file after repack

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Mar 23, 2026, 20:27 UTC
Message-ID
<CAPig+cR7-3rdkHvGbzk8O7P=83pxBTvqXTUgMxYpf+OK9jNCgg@mail.gmail.com>
In-Reply-To
<0bb031e7443bb53abbbb0afaa347285d6d8cf7b8.1774205661.git.lorenzo.pegorari2002@gmail.com>

On Sun, Mar 22, 2026 at 3:18 PM LorenzoPegorari <lorenzo.pegorari2002@gmail.com> wrote:

Show 16 quoted lines
> Create a `copy_all_promisor_files()` helper function used to copy the
> contents of all ".promisor" files in a `repository` inside another
> ".promisor" file.
>
> This function can be used to preserve the contents of all ".promisor"
> files inside a new ".promisor" file, for example when a repack happens.
>
> This function is written in such a way so that it will read all the
> ".promisor" files inside the given `repository` line by line, and copy
> only the lines that are not already present in the destination file. This
> is done to avoid copying the same lines multiple times that may come from
> multiple (redundant) packfiles. There might be another better/cleaner way
> to achieve this.
>
> Signed-off-by: LorenzoPegorari <lorenzo.pegorari2002@gmail.com>
> ---

Thanks, I think this version addresses all my review comments[*] and looks much better overall. Use of `strset` makes a big difference over the previous attempt. A couple minor comments below...

[*]: https://lore.kernel.org/git/CAPig+cQSsMfvHJnwuXGQ1Je8ekz=Rqbaibn-3shbya5y-5xTKg@mail.gmail.com/
Show 11 quoted lines
> diff --git a/pack-write.c b/pack-write.c
> @@ -621,3 +622,63 @@ void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_
> +void copy_all_promisor_files(struct repository *repo, const char *promisor_name)
> +{
> +       struct strset dest_content = STRSET_INIT;
> +       struct strbuf read_line = STRBUF_INIT;
> +       struct strbuf promisor_source_name = STRBUF_INIT;
> +       struct strbuf write_dest = STRBUF_INIT;
> +       FILE *dest, *source;
> +       struct packed_git *p;
> +       int err;
Nit: I probably would have declared `FILE *dest` within the scope of
the repo_for_each_pack() loop as suggested in the review, but it's not
worth a reroll.
Show 23 quoted lines
> +       dest = xfopen(promisor_name, "r+");
> +       while (strbuf_getline(&read_line, dest) != EOF)
> +               strset_add(&dest_content, read_line.buf);
> +
> +       repo_for_each_pack(repo, p) {
> +               if (!p->pack_promisor)
> +                       continue;
> +
> +               strbuf_reset(&promisor_source_name);
> +               strbuf_addstr(&promisor_source_name, p->pack_name);
> +               strbuf_strip_suffix(&promisor_source_name, ".pack");
> +               strbuf_addstr(&promisor_source_name, ".promisor");
> +               source = xfopen(promisor_source_name.buf, "r");
> +
> +               /*
> +                * For each line of the promisor source file, check if it already
> +                * is in the promisor dest file. If not, add it to write_dest, so
> +                * that it will be written in the dest file.
> +                */
> +               while (strbuf_getline(&read_line, source) != EOF) {
> +                       if (strset_add(&dest_content, read_line.buf)) {
> +                               strbuf_addbuf(&write_dest, &read_line);
> +                               strbuf_addstr(&write_dest, "\n");
Not worth a reroll, but this could also be:
    strbuf_addch(&write_dest, '\n');
Show 15 quoted lines
> +                       }
> +               }
> +
> +               err = ferror(source);
> +               err |= fclose(source);
> +               if (err)
> +                       die(_("could not read '%s' promisor file"), promisor_source_name.buf);
> +       }
> +
> +       if (write_dest.len) {
> +               strbuf_strip_suffix(&write_dest, "\n");
> +               if (fseek(dest, 0L, SEEK_END))
> +                       die_errno(_("fseek failed"));
> +               fprintf(dest, "%s\n", write_dest.buf);
> +       }

Can you explain why you strip "\n" and then re-add it via fprintf()? The reason is not immediately obvious.

Show 10 quoted lines
> +       err = ferror(dest);
> +       err |= fclose(dest);
> +       if (err)
> +               die(_("could not write '%s' promisor file"), promisor_name);
> +
> +       strbuf_release(&read_line);
> +       strbuf_release(&promisor_source_name);
> +       strbuf_release(&write_dest);
> +       strset_clear(&dest_content);
> +}
Everything appears to be released. Good.
Previous: LorenzoPegorariNext: Junio C Hamano
Message 12 of 79 in “preserve promisor files content after repack”
  1. 0/3 preserve promisor files content after repackLorenzoPegorari, Mar 21, 2026
  2. 1/3 pack-write: add explanation to promisor file contentLorenzoPegorari, Mar 21, 2026
  3. 2/3 pack-write: add helper to fill promisor file after repackLorenzoPegorari, Mar 21, 2026
  4. 3/3 repack-promisor: preserve content of promisor files after repackLorenzoPegorari, Mar 21, 2026
  5. Eric SunshineMar 22, 2026
  6. Lorenzo PegorariMar 22, 2026
  7. 0/4 preserve promisor files content after repackLorenzoPegorari, Mar 22, 2026
  8. 1/4 pack-write: add explanation to promisor file contentLorenzoPegorari, Mar 22, 2026
  9. 2/4 pack-write: add helper to fill promisor file after repackLorenzoPegorari, Mar 22, 2026
  10. 3/4 repack-promisor: preserve content of promisor files after repackLorenzoPegorari, Mar 22, 2026
  11. 4/4 t7700: test for promisor file content after repackLorenzoPegorari, Mar 22, 2026
  12. Eric SunshineMar 23, 2026
  13. Junio C HamanoMar 23, 2026
  14. Junio C HamanoMar 23, 2026
  15. Junio C HamanoMar 23, 2026
  16. Lorenzo PegorariMar 25, 2026
  17. Lorenzo PegorariMar 26, 2026
  18. Lorenzo PegorariMar 26, 2026
  19. Lorenzo PegorariMar 26, 2026
  20. 0/5 preserve promisor files content after repackLorenzoPegorari, Apr 6, 2026
  21. 1/5 pack-write: add explanation to promisor file contentLorenzoPegorari, Apr 6, 2026
  22. 2/5 pack-write: add helper to fill promisor file after repackLorenzoPegorari, Apr 6, 2026
  23. 3/5 repack-promisor: preserve content of promisor files after repackLorenzoPegorari, Apr 6, 2026
  24. 4/5 t7700: test for promisor file content after repackLorenzoPegorari, Apr 6, 2026
  25. 5/5 t7703: test for promisor file content after geometric repackLorenzoPegorari, Apr 6, 2026
  26. Tian YuchenApr 6, 2026
  27. Lorenzo PegorariApr 6, 2026
  28. Junio C HamanoApr 6, 2026
  29. Junio C HamanoApr 6, 2026
  30. Junio C HamanoApr 6, 2026
  31. Junio C HamanoApr 7, 2026
  32. Junio C HamanoApr 7, 2026
  33. Lorenzo PegorariApr 7, 2026
  34. Lorenzo PegorariApr 7, 2026
  35. Junio C HamanoApr 7, 2026
  36. Lorenzo PegorariApr 7, 2026
  37. Lorenzo PegorariApr 7, 2026
  38. Lorenzo PegorariApr 7, 2026
  39. Lorenzo PegorariApr 8, 2026
  40. 0/5 preserve promisor files content after repackLorenzoPegorari, Apr 10, 2026
  41. 1/5 pack-write: add explanation to promisor file contentLorenzoPegorari, Apr 10, 2026
  42. 2/5 pack-write: add helper to fill promisor file after repackLorenzoPegorari, Apr 10, 2026
  43. 3/5 repack-promisor: preserve content of promisor files after repackLorenzoPegorari, Apr 10, 2026
  44. 4/5 t7700: test for promisor file content after repackLorenzoPegorari, Apr 10, 2026
  45. 5/5 t7703: test for promisor file content after geometric repackLorenzoPegorari, Apr 10, 2026
  46. Junio C HamanoApr 10, 2026
  47. Junio C HamanoApr 10, 2026
  48. Lorenzo PegorariApr 10, 2026
  49. Lorenzo PegorariApr 10, 2026
  50. CodingGuidelines: st_mtimespec vs st_mtim vs st_mtimeJunio C Hamano, Apr 10, 2026
  51. 0/6 preserve promisor files content after repackLorenzoPegorari, Apr 10, 2026
  52. 1/6 pack-write: add explanation to promisor file contentLorenzoPegorari, Apr 10, 2026
  53. 2/6 repack-promisor add helper to fill promisor file after repackLorenzoPegorari, Apr 10, 2026
  54. 3/6 repack-promisor: preserve content of promisor files after repackLorenzoPegorari, Apr 10, 2026
  55. 4/6 t7700: test for promisor file content after repackLorenzoPegorari, Apr 10, 2026
  56. 5/6 t7703: test for promisor file content after geometric repackLorenzoPegorari, Apr 10, 2026
  57. 6/6 repack-promisor: add missing headersLorenzoPegorari, Apr 10, 2026
  58. Junio C HamanoApr 10, 2026
  59. Junio C HamanoApr 10, 2026
  60. Lorenzo PegorariApr 11, 2026
  61. Junio C HamanoApr 11, 2026
  62. Lorenzo PegorariApr 11, 2026
  63. Tian YuchenApr 11, 2026
  64. Tian YuchenApr 11, 2026
  65. Junio C HamanoApr 12, 2026
  66. Elijah NewrenApr 16, 2026
  67. Lorenzo PegorariApr 17, 2026
  68. Lorenzo PegorariApr 17, 2026
  69. Lorenzo PegorariApr 17, 2026
  70. Junio C HamanoApr 17, 2026
  71. 0/6 preserve promisor files content after repackLorenzoPegorari, Apr 18, 2026
  72. 1/6 pack-write: add explanation to promisor file contentLorenzoPegorari, Apr 18, 2026
  73. 2/6 repack-promisor add helper to fill promisor file after repackLorenzoPegorari, Apr 18, 2026
  74. 3/6 repack-promisor: preserve content of promisor files after repackLorenzoPegorari, Apr 18, 2026
  75. 4/6 t7700: test for promisor file content after repackLorenzoPegorari, Apr 18, 2026
  76. 5/6 t7703: test for promisor file content after geometric repackLorenzoPegorari, Apr 18, 2026
  77. 6/6 repack-promisor: add missing headersLorenzoPegorari, Apr 18, 2026
  78. Junio C HamanoMay 12, 2026
  79. Lorenzo PegorariMay 19, 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.