Skip to content

Update Git to v2.33.0 #1751

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

Merged
derrickstolee merged 2 commits into from
Aug 17, 2021
Merged

Update Git to v2.33.0 #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a73986
Update Git to v2.33.0
derrickstolee Aug 3, 2021
30ba580
Enable the ORT strategy in the control repo
derrickstolee Aug 17, 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
3 changes: 3 additions & 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 @@ -66,6 +66,9 @@ public void Initialize()
GitProcess.Invoke(this.RootPath, "branch --set-upstream " + this.Commitish + " origin/" + this.Commitish);
GitProcess.Invoke(this.RootPath, "checkout " + this.Commitish);
GitProcess.Invoke(this.RootPath, "branch --unset-upstream");

// Enable the ORT merge strategy
GitProcess.Invoke(this.RootPath, "config pull.twohead ort");
}

public void Fetch(string commitish)
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.20210701.3</GitPackageVersion>
<GitPackageVersion>2.20210817.4</GitPackageVersion>
<MinimumGitVersion>v2.31.0.vfs.0.1</MinimumGitVersion>
</PropertyGroup>

Expand Down