Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update Git to v2.32.0 #1737

Merged
merged 3 commits into from
Jul 4, 2021
Merged

Update Git to v2.32.0 #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92abc71
RunFunctionalTests.bat: remove exits
derrickstolee Jun 29, 2021
796b59a
FunctionalTests: disable builtin FS Monitor
derrickstolee Jun 29, 2021
e0b7db3
Update to Git 2.32.0.vfs.0.4
derrickstolee Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public void Initialize()
GitProcess.Invoke(this.RootPath, "config merge.renames false");
GitProcess.Invoke(this.RootPath, "config advice.statusUoption false");
GitProcess.Invoke(this.RootPath, "config core.abbrev 40");
GitProcess.Invoke(this.RootPath, "config core.useBuiltinFSMonitor false");
GitProcess.Invoke(this.RootPath, "config pack.useSparse true");
GitProcess.Invoke(this.RootPath, "config reset.quiet true");
GitProcess.Invoke(this.RootPath, "config status.aheadbehind false");
Expand Down
3 changes: 3 additions & 0 deletions GVFS/GVFS/CommandLine/GVFSVerb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,9 @@ public static bool TrySetRequiredGitConfigSettings(Enlistment enlistment)

// Generation number v2 isn't ready for full use. Wait for v3.
{ "commitGraph.generationVersion", "1" },

// Disable the builtin FS Monitor in case it was enabled globally.
{ "core.useBuiltinFSMonitor", "false" },
};

if (!TrySetConfig(enlistment, requiredSettings, isRequired: true))
Expand Down
2 changes: 1 addition & 1 deletion Version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
including taking version numbers 2.X.Y from upstream and updating .W if we have any
hotfixes to microsoft/git.
-->
<GitPackageVersion>2.20210322.1</GitPackageVersion>
<GitPackageVersion>2.20210701.3</GitPackageVersion>
<MinimumGitVersion>v2.31.0.vfs.0.1</MinimumGitVersion>
</PropertyGroup>

Expand Down
3 changes: 0 additions & 3 deletions scripts/RunFunctionalTests.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,18 @@ ECHO gvfs location:
where gvfs
IF NOT %ERRORLEVEL% == 0 (
ECHO error: unable to locate GVFS on the PATH (has it been installed?)
EXIT /b 1
)

ECHO GVFS.Service location:
where GVFS.Service
IF NOT %ERRORLEVEL% == 0 (
ECHO error: unable to locate GVFS.Service on the PATH (has it been installed?)
EXIT /b 1
)

ECHO git location:
where git
IF NOT %ERRORLEVEL% == 0 (
ECHO error: unable to locate Git on the PATH (has it been installed?)
EXIT /b 1
)

%VFS_OUTDIR%\GVFS.FunctionalTests\bin\%CONFIGURATION%\net461\win-x64\GVFS.FunctionalTests.exe /result:TestResult.xml %2 %3 %4 %5
Expand Down