Re: sb/submodule-move-nested breaks t7411 under GIT_FSMONITOR_TEST
- From
Stefan Beller <sbeller@google.com>
- Date
- Sep 6, 2018, 16:57 UTC
- Message-ID
- <CAGZ79kYKzrRXy+GUCpMN3jpo4MvcpGvBFvEkTjrsy85XJb0K2A@mail.gmail.com>
- In-Reply-To
- <87tvn2remn.fsf@evledraar.gmail.com>
Show 8 quoted lines
> > Will debug further. > > I spotted this again after testing the split index (see > https://public-inbox.org/git/87va7ireuu.fsf@evledraar.gmail.com/) and > was testing the fsmonitor test mode as well. > > So gentle *poke*: Did you get anywhere with debugging this? It's still > failing on "master" now.
I started looking into this again, help would be appreciated, as I do not quite understand the fsmonitor part.
The error is in the setup, where we have "git mv a b"
GIT_TRACE_FSMONITOR=1 GIT_TRACE=1 GIT_FSMONITOR_TEST=$PWD/t7519/fsmonitor-all ./t7411-submodule-config.sh -d -i -v -x ++ git mv a b trace: built-in: git mv a b read fsmonitor extension successful add fsmonitor refresh fsmonitor trace: run_command: cd '/u/git/t/trash directory.t7411-submodule-config/super'; /u/git/t/t7519/fsmonitor-all 1 1536252819824793728 fsmonitor process '/u/git/t/t7519/fsmonitor-all' returned success mark_fsmonitor_clean '.gitmodules' write fsmonitor extension successful
or with more trace_printfs littered through the code (https://github.com/stefanbeller/git/tree/submodule_fsmoitor_debug)
trace: built-in: git mv a b read fsmonitor extension successful add fsmonitor refresh fsmonitor trace: run_command: cd '/u/git/t/trash directory.t7411-submodule-config/super'; /u/git/t/t7519/fsmonitor-all 1 1536252497951329341 fsmonitor process '/u/git/t/t7519/fsmonitor-all' returned success need to stage .gitmodules calling add_file_to_index
I suspect that the FSMONITOR API is handled wrongly by the part of git-mv that writes out the .gitmodules file (if needed) and the .git/index (as needed).
Ben, do you have an idea?
Thanks, Stefan