-
Notifications
You must be signed in to change notification settings - Fork 451
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update Git to v2.20.0.vfs.1.1 #600
Conversation
130e97c
to
fc14cc1
Compare
@kewillford The functional tests are breaking on things like 'reset' and 'status', and the biggest change in |
@derrickstolee @benpeart was there some change to the output of |
9cc6534
to
9b17c8d
Compare
@kewillford @benpeart @jrbriggs It appears that the "reset.quiet" setting doesn't work well in our setting. I tried setting it to true in our control repo, but that wasn't enough. Disabling it in our processes made the functional tests pass. My guess is that the index-changed hook merged cleanly with the reset quiet code in 2.20.0, but that merge introduced a different behavior than the hook expects. For now, I'll clean up this PR to only update the Git version and remove the "reset.quiet" setting and we can work to fix the integration in a follow-up PR. |
9b17c8d
to
c2018f6
Compare
@benpeart The latest functional test failures all have a message like this:
This is because I forgot to include your command-canceling PR in the previous builds. Turns out: we are calling I'm tempted to pull the change out of the v2.20.0 PR and work to reapply the change directly to that branch. We can then find the best way to halt auto-GC in a VFS for Git repo. |
Yes, please pull this patch out of 2.20.0 - I'll go back and figure out best to handle the automatic 'git gc --auto' commands (which will fail silently later as we turn off auto GC in VFSForGIT repos). My bad - I hadn't merged the PR to switch VFSForGIT to use the new version of git yet and didn't expect it to get pulled into 2.20.0 before I'd had a chance to run the functional tests. |
Do you know what is running the |
Several git commands spawn "gc --auto" themselves (am, commit, fetch, merge, rebase, etc). I've updated the patch in git to check for --auto and will only die if the config setting 'gc.auto' isn't "0" (ie turned off). |
c2018f6
to
538ffd7
Compare
The latest push disables the builtin rebase. This is to check the performance results. It may cause a failure in the functional tests due to different warning/error messages. |
487d985
to
c4837a6
Compare
c4837a6
to
d1d371e
Compare
Includes v2.20.0.windows.1.
It also disables
reset.quiet
(correctness issue) andrebase.useBuiltin
(performance issue).