Skip to content

Update Git to v2.27.0 #1663

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 3 commits into from
Jun 2, 2020
Merged

Update Git to v2.27.0 #1663

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
c50508a
Update Git to v2.27.0
derrickstolee May 18, 2020
7037017
GitProcess: repack kept packs
derrickstolee May 19, 2020
4c2201f
ResetMixedTests: drop test that behaves differently
derrickstolee May 19, 2020
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
2 changes: 1 addition & 1 deletion GVFS/GVFS.Build/GVFS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup Label="Parameters">
<GVFSVersion>0.2.173.2</GVFSVersion>
<GitPackageVersion>2.20200420.2</GitPackageVersion>
<GitPackageVersion>2.20200601.2</GitPackageVersion>
</PropertyGroup>

<PropertyGroup Label="DefaultSettings">
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.Common/Git/GitProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public Result MultiPackIndexExpire(string gitObjectDirectory)

public Result MultiPackIndexRepack(string gitObjectDirectory, string batchSize)
{
return this.InvokeGitAgainstDotGitFolder($"-c pack.threads=1 multi-pack-index repack --object-dir=\"{gitObjectDirectory}\" --batch-size={batchSize} --no-progress");
return this.InvokeGitAgainstDotGitFolder($"-c pack.threads=1 -c repack.packKeptObjects=true multi-pack-index repack --object-dir=\"{gitObjectDirectory}\" --batch-size={batchSize} --no-progress");
}

public Process GetGitProcess(string command, string workingDirectory, string dotGitDirectory, bool useReadObjectHook, bool redirectStandardError, string gitObjectsDirectory)
Expand Down
13 changes: 0 additions & 13 deletions GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,6 @@ public void ResetMixedThenCheckoutWithConflicts()
this.FilesShouldMatchCheckoutOfTargetBranch();
}

[TestCase]
public void ResetMixedOnlyAddedThenCheckoutWithConflicts()
{
this.ValidateGitCommand("checkout " + GitRepoTests.ConflictTargetBranch);
this.ValidateGitCommand("reset --mixed HEAD~1");

// This will reset all the files except the files that were added
// and are untracked to make sure we error out with those using sparse-checkout
this.ValidateGitCommand("checkout -f");
this.ValidateGitCommand("checkout " + GitRepoTests.ConflictSourceBranch);
this.FilesShouldMatchCheckoutOfTargetBranch();
}

[TestCase]
public void ResetMixedAndCheckoutFile()
{
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.UnitTests/Maintenance/PackfileMaintenanceStepTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class PackfileMaintenanceStepTests
private string ExpireCommand => $"multi-pack-index expire --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\" --no-progress";
private string VerifyCommand => $"-c core.multiPackIndex=true multi-pack-index verify --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\" --no-progress";
private string WriteCommand => $"-c core.multiPackIndex=true multi-pack-index write --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\" --no-progress";
private string RepackCommand => $"-c pack.threads=1 multi-pack-index repack --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\" --batch-size=2g --no-progress";
private string RepackCommand => $"-c pack.threads=1 -c repack.packKeptObjects=true multi-pack-index repack --object-dir=\"{this.context.Enlistment.GitObjectsRoot}\" --batch-size=2g --no-progress";

[TestCase]
public void PackfileMaintenanceIgnoreTimeRestriction()
Expand Down