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

regression in new built-in stash + fsmonitor (was Re: [PATCH v13 11/27] stash: convert apply to builtin)

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Mar 14, 2019, 13:19 UTC
Message-ID
<87ftrpbnkg.fsf@evledraar.gmail.com>
In-Reply-To
<20190225231631.30507-12-t.gummerer@gmail.com>
On Tue, Feb 26 2019, Thomas Gummerer wrote:
Show 14 quoted lines
> From: Joel Teichroeb <joel@teichroeb.net>
>
> Add a builtin helper for performing stash commands. Converting
> all at once proved hard to review, so starting with just apply
> lets conversion get started without the other commands being
> finished.
>
> The helper is being implemented as a drop in replacement for
> stash so that when it is complete it can simply be renamed and
> the shell script deleted.
>
> Delete the contents of the apply_stash shell function and replace
> it with a call to stash--helper apply until pop is also
> converted.
This
    GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all ./t3420-rebase-autostash.sh

Now fails, which bisects to 8a0fc8d19d ("stash: convert apply to builtin", 2019-02-25).

Tested on both a CentOS 6 & modern Debian testing machine:
    + git rebase -i --autostash HEAD^
    Created autostash: 5cd734b
    HEAD is now at 0c4d2f1 third commit
    hint: Waiting for your editor to close the file...
    error: There was a problem with the editor '"$FAKE_EDITOR"'.
    Applied autostash.
    + exit_code=1
    + test 1 -eq 0
    + test_match_signal 13 1
    + test 1 = 141
    + test 1 = 269
    + return 1
    + test 1 -gt 129
    + test 1 -eq 127
    + test 1 -eq 126
    + return 0
    + rm -f abort-editor.sh
    + echo conflicting-content
    + test_cmp expected file0
    + diff -u expected file0
    --- expected    2019-03-14 13:19:08.212215263 +0000
    +++ file0       2019-03-14 13:19:08.196215250 +0000
    @@ -1 +1 @@
    -conflicting-content
    +uncommitted-content
    error: last command exited with $?=1
    not ok 36 - autostash is saved on editor failure with conflict

Are you able to reproduce this? And if so I suggest running the test suite with some of the other GIT_TEST_* modes documented in t/README. Maybe it'll turn up something else...

Previous: Thomas GummererNext: Johannes Schindelin
Message 53 of 106 in “Convert "git stash" to C builtin”
  1. 00/26 Convert "git stash" to C builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  2. 01/26 sha1-name.c: add `get_oidf()` which acts like `get_oid()`Paul-Sebastian Ungureanu, Dec 20, 2018
  3. 02/26 strbuf.c: add `strbuf_join_argv()`Paul-Sebastian Ungureanu, Dec 20, 2018
  4. 03/26 strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`Paul-Sebastian Ungureanu, Dec 20, 2018
  5. 05/26 stash: improve option parsing test coveragePaul-Sebastian Ungureanu, Dec 20, 2018
  6. 04/26 ident: add the ability to provide a "fallback identity"Paul-Sebastian Ungureanu, Dec 20, 2018
  7. Junio C HamanoDec 26, 2018
  8. Johannes SchindelinDec 27, 2018
  9. Junio C HamanoDec 28, 2018
  10. 06/26 t3903: modernize stylePaul-Sebastian Ungureanu, Dec 20, 2018
  11. 08/26 stash: add tests for `git stash show` configPaul-Sebastian Ungureanu, Dec 20, 2018
  12. 09/26 stash: mention options in `show` synopsisPaul-Sebastian Ungureanu, Dec 20, 2018
  13. 07/26 stash: rename test cases to be more descriptivePaul-Sebastian Ungureanu, Dec 20, 2018
  14. 10/26 stash: convert apply to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  15. 12/26 stash: convert branch to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  16. 15/26 stash: convert show to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  17. 16/26 stash: convert store to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  18. 14/26 stash: convert list to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  19. 13/26 stash: convert pop to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  20. 11/26 stash: convert drop and clear to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  21. 19/26 stash: make push -q quietPaul-Sebastian Ungureanu, Dec 20, 2018
  22. 22/26 stash: replace all `write-tree` child processes with API callsPaul-Sebastian Ungureanu, Dec 20, 2018
  23. 21/26 stash: optimize `get_untracked_files()` and `check_changes()`Paul-Sebastian Ungureanu, Dec 20, 2018
  24. Thomas GummererJan 6, 2019
  25. 26/26 tests: add a special setup where stash.useBuiltin is offPaul-Sebastian Ungureanu, Dec 20, 2018
  26. 24/26 stash: add back the original, scripted `git stash`Paul-Sebastian Ungureanu, Dec 20, 2018
  27. 20/26 stash: convert save to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  28. 18/26 stash: convert push to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  29. SZEDER GáborFeb 8, 2019
  30. Thomas GummererFeb 10, 2019
  31. SZEDER GáborFeb 11, 2019
  32. Thomas GummererFeb 12, 2019
  33. SZEDER GáborFeb 19, 2019
  34. Johannes SchindelinFeb 19, 2019
  35. Junio C HamanoFeb 19, 2019
  36. Johannes SchindelinFeb 20, 2019
  37. Thomas GummererFeb 19, 2019
  38. Junio C HamanoFeb 20, 2019
  39. Johannes SchindelinFeb 20, 2019
  40. Thomas GummererFeb 20, 2019
  41. 00/27 Convert "git stash" to C builtinThomas Gummerer, Feb 25, 2019
  42. 01/27 sha1-name.c: add `get_oidf()` which acts like `get_oid()`Thomas Gummerer, Feb 25, 2019
  43. 02/27 strbuf.c: add `strbuf_join_argv()`Thomas Gummerer, Feb 25, 2019
  44. 03/27 strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`Thomas Gummerer, Feb 25, 2019
  45. 05/27 stash: improve option parsing test coverageThomas Gummerer, Feb 25, 2019
  46. 04/27 ident: add the ability to provide a "fallback identity"Thomas Gummerer, Feb 25, 2019
  47. 06/27 t3903: modernize styleThomas Gummerer, Feb 25, 2019
  48. 07/27 t3903: add test for --intent-to-add fileThomas Gummerer, Feb 25, 2019
  49. 08/27 stash: rename test cases to be more descriptiveThomas Gummerer, Feb 25, 2019
  50. 09/27 stash: add tests for `git stash show` configThomas Gummerer, Feb 25, 2019
  51. 10/27 stash: mention options in `show` synopsisThomas Gummerer, Feb 25, 2019
  52. 11/27 stash: convert apply to builtinThomas Gummerer, Feb 25, 2019
  53. regression in new built-in stash + fsmonitor (was Re: [PATCH v13 11/27] stash: convert apply to builtin)Ævar Arnfjörð Bjarmason, Mar 14, 2019
  54. Johannes SchindelinMar 14, 2019
  55. Ævar Arnfjörð BjarmasonMar 14, 2019
  56. Johannes SchindelinMar 14, 2019
  57. Ævar Arnfjörð BjarmasonMar 14, 2019
  58. Ben PeartMar 15, 2019
  59. 12/27 stash: convert drop and clear to builtinThomas Gummerer, Feb 25, 2019
  60. Jeff KingMar 7, 2019
  61. Thomas GummererMar 9, 2019
  62. Jeff KingMar 10, 2019
  63. Junio C HamanoMar 11, 2019
  64. Thomas GummererMar 11, 2019
  65. 13/27 stash: convert branch to builtinThomas Gummerer, Feb 25, 2019
  66. 14/27 stash: convert pop to builtinThomas Gummerer, Feb 25, 2019
  67. 15/27 stash: convert list to builtinThomas Gummerer, Feb 25, 2019
  68. 16/27 stash: convert show to builtinThomas Gummerer, Feb 25, 2019
  69. 17/27 stash: convert store to builtinThomas Gummerer, Feb 25, 2019
  70. 18/27 stash: convert create to builtinThomas Gummerer, Feb 25, 2019
  71. Jeff KingMar 7, 2019
  72. Johannes SchindelinMar 8, 2019
  73. Thomas GummererMar 9, 2019
  74. Junio C HamanoMar 11, 2019
  75. Junio C HamanoMar 11, 2019
  76. Thomas GummererMar 11, 2019
  77. stash: pass pathspec as pointerThomas Gummerer, Mar 11, 2019
  78. Junio C HamanoMar 12, 2019
  79. Johannes SchindelinMar 12, 2019
  80. Thomas GummererMar 12, 2019
  81. Junio C HamanoMar 13, 2019
  82. Johannes SchindelinMar 13, 2019
  83. Thomas GummererMar 15, 2019
  84. 19/27 stash: convert push to builtinThomas Gummerer, Feb 25, 2019
  85. 20/27 stash: make push -q quietThomas Gummerer, Feb 25, 2019
  86. 21/27 stash: convert save to builtinThomas Gummerer, Feb 25, 2019
  87. 22/27 stash: optimize `get_untracked_files()` and `check_changes()`Thomas Gummerer, Feb 25, 2019
  88. 23/27 stash: replace all `write-tree` child processes with API callsThomas Gummerer, Feb 25, 2019
  89. 24/27 stash: convert `stash--helper.c` into `stash.c`Thomas Gummerer, Feb 25, 2019
  90. 26/27 stash: optionally use the scripted version againThomas Gummerer, Feb 25, 2019
  91. 25/27 stash: add back the original, scripted `git stash`Thomas Gummerer, Feb 25, 2019
  92. 27/27 tests: add a special setup where stash.useBuiltin is offThomas Gummerer, Feb 25, 2019
  93. Johannes SchindelinFeb 26, 2019
  94. Thomas GummererFeb 26, 2019
  95. Ævar Arnfjörð BjarmasonFeb 26, 2019
  96. Johannes SchindelinFeb 26, 2019
  97. Junio C HamanoMar 3, 2019
  98. Junio C HamanoMar 3, 2019
  99. Thomas GummererMar 3, 2019
  100. 25/26 stash: optionally use the scripted version againPaul-Sebastian Ungureanu, Dec 20, 2018
  101. Thomas GummererJan 6, 2019
  102. 23/26 stash: convert `stash--helper.c` into `stash.c`Paul-Sebastian Ungureanu, Dec 20, 2018
  103. 17/26 stash: convert create to builtinPaul-Sebastian Ungureanu, Dec 20, 2018
  104. Junio C HamanoJan 3, 2019
  105. Johannes SchindelinJan 18, 2019
  106. Junio C HamanoJan 18, 2019

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.