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

Re: [External] Git Rebase: test failing with GIT_TEST_STASH_USE_BUILTIN=false

From
Son Luong Ngoc <sluongng@gmail.com>
Date
Mar 1, 2020, 10:40 UTC
Message-ID
<F59C8901-122C-4B75-BCEC-4D8D323C78A0@gmail.com>
In-Reply-To
<89C2FD92-5616-4834-98ED-22630DA61925@gmail.com>
Similar strategy was used for t.3904, which has been failing with this flag since 2.25.0

$ cat run-test.sh #!/bin/bash

make -j8 prefix=/usr all
(
  cd ./t && GIT_TEST_STASH_USE_BUILTIN=false ./t3904-stash-patch.sh
)

$ git bisect log # bad: [2d2118b814c11f509e1aa76cb07110f7231668dc] The seventh batch for 2.26 # good: [d9589d4051537c387b70dc76e430c61b4c85a86d] Git 2.22.2 git bisect start 'HEAD' 'v2.22.2' # good: [22dd22dce050f042b3eec165440966186691db42] Merge branch 'wb/fsmonitor-bitmap-fix' git bisect good 22dd22dce050f042b3eec165440966186691db42 # good: [6514ad40a1a3cf80b2c25e3318dbf0252599fb8d] Merge branch 'ra/t5150-depends-on-perl' git bisect good 6514ad40a1a3cf80b2c25e3318dbf0252599fb8d # bad: [f52ab33616ee1d241f2292f1c1e47ba84a263523] Merge branch 'bc/hash-independent-tests-part-7' git bisect bad f52ab33616ee1d241f2292f1c1e47ba84a263523 # good: [4d924528d8bfe947abfc54ee9bd3892ab509c8cd] Revert "Merge branch 'ra/rebase-i-more-options'" git bisect good 4d924528d8bfe947abfc54ee9bd3892ab509c8cd # good: [f0940743facd619f251009e0307d8d6452cc582e] Merge branch 'js/builtin-add-i-cmds' git bisect good f0940743facd619f251009e0307d8d6452cc582e # good: [381e8e9de142b636e4a25b6df113d70168e21a34] Merge branch 'dl/test-must-fail-fixes' git bisect good 381e8e9de142b636e4a25b6df113d70168e21a34 # bad: [d0e70cd32e95df3be2250536f9089c858a298874] Merge branch 'am/checkout-file-and-ref-ref-ambiguity' git bisect bad d0e70cd32e95df3be2250536f9089c858a298874 # bad: [94ac3c31f730ab278e1373a942fb4503829f4279] terminal: make the code of disable_echo() reusable git bisect bad 94ac3c31f730ab278e1373a942fb4503829f4279 # bad: [52628f94fc35f57f0b3c54e4f849e490bfa44449] built-in add -p: implement the "checkout" patch modes git bisect bad 52628f94fc35f57f0b3c54e4f849e490bfa44449 # good: [36bae1dc0ee777aa529dd955f2e619281265f262] built-in add -p: implement the "stash" and "reset" patch modes git bisect good 36bae1dc0ee777aa529dd955f2e619281265f262 # bad: [6610e4628ac12396efc20201fe85d67591bed247] built-in stash: use the built-in `git add -p` if so configured git bisect bad 6610e4628ac12396efc20201fe85d67591bed247 # bad: [90a6bb98d11a664f729dbb86c90d9c7a38ea825a] legacy stash -p: respect the add.interactive.usebuiltin setting git bisect bad 90a6bb98d11a664f729dbb86c90d9c7a38ea825a # first bad commit: [90a6bb98d11a664f729dbb86c90d9c7a38ea825a] legacy stash -p: respect the add.interactive.usebuiltin setting

Which was merged in https://github.com/gitgitgadget/git/commit/9a5315edfdf662c4d9bf444ebc297bc802fa5e04 Author was Johannes Schindelin

Thanks, Son Luong.

Show 85 quoted lines
> On Mar 1, 2020, at 10:59, Son Luong Ngoc <sluongng@gmail.com> wrote:
> 
> (this is a resent due to git@vger.kernel.org blocked HTML content, sry for the noises)
> (following up on https://public-inbox.org/git/xmqq36ayob9a.fsf@gitster-ct.c.googlers.com/T/#t )
> 
> Hi folks,
> 
> I ran a simple git-bisect on this to try to figure-out whats wrong:
> 
> $ cat run-test.sh
> #!/bin/bash
> 
> make -j8 prefix=/usr all
> (
>  cd ./t
>  GIT_TEST_STASH_USE_BUILTIN=false ./t3903-stash.sh --run='103'
> )
> $ git bisect start master v2.22.2
> $ git bisect run ./run-test.sh
> ...
> $ git bisect log
> (b932f6a5e8...)|BISECTING ~/work/booking/git/git> git bisect log
> # bad: [2d2118b814c11f509e1aa76cb07110f7231668dc] The seventh batch for 2.26
> # good: [d9589d4051537c387b70dc76e430c61b4c85a86d] Git 2.22.2
> git bisect start 'HEAD' 'v2.22.2'
> # bad: [22dd22dce050f042b3eec165440966186691db42] Merge branch 'wb/fsmonitor-bitmap-fix'
> git bisect bad 22dd22dce050f042b3eec165440966186691db42
> # bad: [fa9e7934c780bc804a09bfc88a93825096b3155e] Merge branch 'bm/repository-layout-typofix'
> git bisect bad fa9e7934c780bc804a09bfc88a93825096b3155e
> # good: [3a94cb31d52f061c315b00bfc005f1b1c42ac92d] bin-wrappers: append `.exe` to target paths if necessary
> git bisect good 3a94cb31d52f061c315b00bfc005f1b1c42ac92d
> # bad: [7b70d46ca410f9d37045558329c3143570d47ba6] Merge branch 'bb/grep-pcre2-bug-message-fix'
> git bisect bad 7b70d46ca410f9d37045558329c3143570d47ba6
> # good: [d60dc1a0b3829f3c4d69696f43f1c178c0701cdb] Merge branch 'ew/repack-with-bitmaps-by-default'
> git bisect good d60dc1a0b3829f3c4d69696f43f1c178c0701cdb
> # good: [43ba21cb574ee3f9a1acf4580868982f4c883ac6] Merge branch 'tg/range-diff-output-update'
> git bisect good 43ba21cb574ee3f9a1acf4580868982f4c883ac6
> # good: [080af915a3ee4d9511dc288b29143b9958ac0adc] Merge branch 'mt/dir-iterator-updates'
> git bisect good 080af915a3ee4d9511dc288b29143b9958ac0adc
> # bad: [75ce48674889df6a2bb493fb5d6bef0ef60ca7ae] Merge branch 'di/readme-markup-fix'
> git bisect bad 75ce48674889df6a2bb493fb5d6bef0ef60ca7ae
> # good: [984da7f8d2589b53cca7c920e597eab30d4c1b36] Merge branch 'sr/gpg-interface-stop-at-the-end'
> git bisect good 984da7f8d2589b53cca7c920e597eab30d4c1b36
> # bad: [f8aee8576ac5e01fa993c80b5b888af214c03758] Merge branch 'tg/stash-keep-index-with-removed-paths'
> git bisect bad f8aee8576ac5e01fa993c80b5b888af214c03758
> # good: [b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65] stash: fix handling removed files with --keep-index
> git bisect good b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65
> # first bad commit: [f8aee8576ac5e01fa993c80b5b888af214c03758] Merge branch 'tg/stash-keep-index-with-removed-paths'
> 
> Which pinned point the failure starting from the moment the test was added at https://github.com/git/git/commit/b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65 by @t.gummerer
> 
> I would appreciate if we can either deprecate the GIT_TEST_STASH_USE_BUILTIN flag entirely or wrap the test with an 'if' so that we auto skip it when the flag is enabled.
> 
> Thanks,
> Son Luong.
> 
>> On Feb 25, 2020, at 17:57, Junio C Hamano <gitster@pobox.com> wrote:
>> 
>> Son Luong Ngoc <son.luong@booking.com> writes:
>> 
>>> I have been trying to build git from source and noticing that some
>>> tests have been failing since 2.25 with the flag
>>> "GIT_TEST_STASH_USE_BUILTIN=false"
>>> 
>>> I think in 2.25 t3903.103 started to fail (rebase related) and
>>> current master t3904 may be failing also.
>>> 
>>> Is "GIT_TEST_STASH_USE_BUILTIN=false" is still being tested with
>>> or are we totally deprecating this flag?
>> 
>> In the longer term, when "git stash" gains new features that did not
>> exist in the original scripted version, tests that observe how these
>> features work would start failing when using the scripted version.
>> 
>> I picked some people from "git shortlog --no-merges builtin/stash.c"
>> and placed them on the CC line---perhaps they may know more.  It
>> happens that Johannes is also familiar with "rebase", which you
>> said is involved in the test failure, so I'd imagine he would be the
>> best person to ask.
>> 
>> Thanks for a report.
>> 
>> 
> 
>
Previous: Son Luong NgocNext: Johannes Schindelin
Message 19 of 21 in “Git Rebase: test failing with GIT_TEST_STASH_USE_BUILTIN=false”
  1. Son Luong NgocFeb 24, 2020
  2. Junio C HamanoFeb 25, 2020
  3. 1/2 stash: get git_stash_config at the top levelThomas Gummerer, Mar 2, 2020
  4. 2/2 stash: remove the stash.useBuiltin settingThomas Gummerer, Mar 2, 2020
  5. Junio C HamanoMar 2, 2020
  6. non-regression bug in 'git merge' (really, xdiff/xmerge, I think)Junio C Hamano, Mar 2, 2020
  7. Elijah NewrenMar 6, 2020
  8. Johannes SchindelinMar 3, 2020
  9. Junio C HamanoMar 3, 2020
  10. Thomas GummererMar 3, 2020
  11. Johannes SchindelinMar 4, 2020
  12. 1/2 stash: get git_stash_config at the top levelThomas Gummerer, Mar 3, 2020
  13. 2/2 stash: remove the stash.useBuiltin settingThomas Gummerer, Mar 3, 2020
  14. Junio C HamanoMar 3, 2020
  15. Thomas GummererMar 4, 2020
  16. Junio C HamanoMar 4, 2020
  17. Thomas GummererMar 5, 2020
  18. Son Luong NgocMar 1, 2020
  19. Son Luong NgocMar 1, 2020
  20. Johannes SchindelinMar 6, 2020
  21. Thomas GummererMar 6, 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.