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

Re: [PATCH v3 0/5] stash: clean up index-mode test merge

From
D. Ben Knoble <ben.knoble@gmail.com>
Date
Sep 26, 2026, 12:20 UTC
Message-ID
<CALnO6CBpV6TiQGKSxEcurwzZEE3rvqO0EryO=5orD8F3Ren8Kg@mail.gmail.com>
In-Reply-To
<cover.1790425008.git.ben.knoble@gmail.com>
On Sat, Sep 26, 2026 at 8:17 AM D. Ben Knoble <ben.knoble@gmail.com> wrote:
Show 13 quoted lines
>
> Hi all,
>
> This small patch series fixes a bug reported by Eli Barzilay in the
> interaction between autostashing, staged index entries, and
> stash.index=true.
>
> The first patch is an incidental cleanup, and the second re-arranges one
> line to make the change easier. The third and fourth add missing test
> coverage (which catch breakages from prior incorrect rounds of this
> series), while the last holds the interesting bits.
>
> Changes in v3:

Woops. Contrary to my usual practice of late, I sent this in reply to v2 rather than v1. Oh well.

Previous: D. Ben KnobleNext: Junio C Hamano
Message 40 of 78 in “Hi all,”
  1. 0/2 Hi all,D. Ben Knoble, Sep 19, 2026
  2. 1/2 builtin/stash: remove unused headerD. Ben Knoble, Sep 19, 2026
  3. 2/2 builtin/stash: merge index in-coreD. Ben Knoble, Sep 19, 2026
  4. D. Ben KnobleSep 19, 2026
  5. Phillip WoodSep 21, 2026
  6. Junio C HamanoSep 21, 2026
  7. D. Ben KnobleSep 22, 2026
  8. D. Ben KnobleSep 22, 2026
  9. Phillip WoodSep 22, 2026
  10. D. Ben KnobleSep 22, 2026
  11. 0/4 stash: clean up index-mode test mergeD. Ben Knoble, Sep 23, 2026
  12. 1/4 builtin/stash: remove unused headerD. Ben Knoble, Sep 23, 2026
  13. 2/4 stash: prepare merge options earlierD. Ben Knoble, Sep 23, 2026
  14. 3/4 t: test failed "stash apply --index"D. Ben Knoble, Sep 23, 2026
  15. 4/4 builtin/stash: merge index in-coreD. Ben Knoble, Sep 23, 2026
  16. Phillip WoodSep 24, 2026
  17. Phillip WoodSep 24, 2026
  18. Junio C HamanoSep 24, 2026
  19. Junio C HamanoSep 25, 2026
  20. D. Ben KnobleSep 25, 2026
  21. D. Ben KnobleSep 25, 2026
  22. D. Ben KnobleSep 25, 2026
  23. Phillip WoodSep 25, 2026
  24. Phillip WoodSep 25, 2026
  25. Phillip WoodSep 25, 2026
  26. D. Ben KnobleSep 25, 2026
  27. D. Ben KnobleSep 25, 2026
  28. Junio C HamanoSep 25, 2026
  29. Junio C HamanoSep 25, 2026
  30. Phillip WoodSep 26, 2026
  31. Phillip WoodSep 26, 2026
  32. D. Ben KnobleSep 26, 2026
  33. D. Ben KnobleSep 26, 2026
  34. 0/5 stash: clean up index-mode test mergeD. Ben Knoble, Sep 26, 2026
  35. 1/5 builtin/stash: remove unused headerD. Ben Knoble, Sep 26, 2026
  36. 2/5 stash: prepare merge options earlierD. Ben Knoble, Sep 26, 2026
  37. 3/5 t3903: test stash --index mergesD. Ben Knoble, Sep 26, 2026
  38. 4/5 t3903: test failed "stash apply --index"D. Ben Knoble, Sep 26, 2026
  39. 5/5 builtin/stash: merge index in-coreD. Ben Knoble, Sep 26, 2026
  40. D. Ben KnobleSep 26, 2026
  41. Junio C HamanoSep 27, 2026
  42. Junio C HamanoSep 27, 2026
  43. Junio C HamanoSep 28, 2026
  44. Phillip WoodSep 28, 2026
  45. D. Ben KnobleSep 28, 2026
  46. D. Ben KnobleSep 28, 2026
  47. D. Ben KnobleSep 28, 2026
  48. D. Ben KnobleSep 28, 2026
  49. D. Ben KnobleSep 28, 2026
  50. Phillip WoodSep 28, 2026
  51. Thomas BachemSep 28, 2026
  52. Junio C HamanoSep 28, 2026
  53. D. Ben KnobleSep 28, 2026
  54. Phillip WoodSep 28, 2026
  55. Phillip WoodSep 28, 2026
  56. D. Ben KnobleSep 28, 2026
  57. Phillip WoodSep 29, 2026
  58. D. Ben KnobleSep 29, 2026
  59. 0/5 stash: clean up index-mode test mergeD. Ben Knoble, Sep 29, 2026
  60. 1/5 builtin/stash: remove unused headerD. Ben Knoble, Sep 29, 2026
  61. 2/5 stash: prepare merge options earlierD. Ben Knoble, Sep 29, 2026
  62. 3/5 t3903: test failed "stash apply --index"D. Ben Knoble, Sep 29, 2026
  63. 4/5 t5520: don't expire reflogs where it mattersD. Ben Knoble, Sep 29, 2026
  64. 5/5 builtin/stash: merge index in-coreD. Ben Knoble, Sep 29, 2026
  65. Phillip WoodSep 29, 2026
  66. Phillip WoodSep 29, 2026
  67. Phillip WoodSep 29, 2026
  68. Ben KnobleSep 29, 2026
  69. Junio C HamanoSep 29, 2026
  70. D. Ben KnobleSep 30, 2026
  71. 1/4 builtin/stash: remove unused headerD. Ben Knoble, Sep 30, 2026
  72. 0/4 stash: clean up index-mode test mergeD. Ben Knoble, Sep 30, 2026
  73. 3/4 t3903: test failed "stash apply --index"D. Ben Knoble, Sep 30, 2026
  74. 2/4 stash: prepare merge options earlierD. Ben Knoble, Sep 30, 2026
  75. 4/4 builtin/stash: merge index in-coreD. Ben Knoble, Sep 30, 2026
  76. D. Ben KnobleSep 30, 2026
  77. Phillip WoodOct 1, 2026
  78. Junio C HamanoOct 1, 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.