Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Fix race condition when fetching from and deleting a temporary remote #1250

Merged
merged 2 commits into from
Oct 10, 2017
Merged

Fix race condition when fetching from and deleting a temporary remote #1250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d842c
Fix race when fetching from temporary remote
jcansdale Oct 5, 2017
5f1f3d8
Move `Fetch` (from Uri) next to its friends
jcansdale Oct 5, 2017
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
55 changes: 35 additions & 20 deletions src/GitHub.App/Services/GitClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,41 @@ public Task Fetch(IRepository repository, string remoteName)
});
}

public Task Fetch(IRepository repo, UriString cloneUrl, params string[] refspecs)
{
var httpsUrl = UriString.ToUriString(cloneUrl.ToRepositoryUrl());

var originRemote = repo.Network.Remotes[defaultOriginName];
if (originRemote != null && originRemote.Url == httpsUrl)
{
return Fetch(repo, defaultOriginName, refspecs);
}

return Task.Factory.StartNew(() =>
{
try
{
var tempRemoteName = cloneUrl.Owner + "-" + Guid.NewGuid();
var remote = repo.Network.Remotes.Add(tempRemoteName, httpsUrl);
try
{
repo.Network.Fetch(remote, refspecs, fetchOptions);
}
finally
{
repo.Network.Remotes.Remove(tempRemoteName);
}
}
catch (Exception ex)
{
log.Error("Failed to fetch", ex);
#if DEBUG
throw;
#endif
}
});
}

public Task Fetch(IRepository repository, string remoteName, params string[] refspecs)
{
Guard.ArgumentNotNull(repository, nameof(repository));
Expand Down Expand Up @@ -430,26 +465,6 @@ public Task<bool> IsHeadPushed(IRepository repo)
});
}

public Task Fetch(IRepository repo, UriString cloneUrl, params string[] refspecs)
{
var httpsUrl = UriString.ToUriString(cloneUrl.ToRepositoryUrl());
if (repo.Network.Remotes[defaultOriginName]?.Url == httpsUrl)
{
return Fetch(repo, defaultOriginName, refspecs);
}

var tempRemoteName = cloneUrl.Owner + "-" + Guid.NewGuid();
repo.Network.Remotes.Add(tempRemoteName, httpsUrl);
try
{
return Fetch(repo, tempRemoteName, refspecs);
}
finally
{
repo.Network.Remotes.Remove(tempRemoteName);
}
}

static bool IsCanonical(string s)
{
Guard.ArgumentNotEmptyString(s, nameof(s));
Expand Down