Skip to content

Fix DeleteSourceBranch option in mocks #102

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
merged 3 commits into from
Oct 25, 2021
Merged

Fix DeleteSourceBranch option in mocks #102

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81ffa61
Fix DeleteSourceBranch option in mocks
Oct 20, 2021
9bfe38b
Merge branch 'main' into fix-deletesourcebranch-option-in-mocks
Oct 21, 2021
d4648e5
Merge branch 'main' into fix-deletesourcebranch-option-in-mocks
louis-z Oct 25, 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
7 changes: 3 additions & 4 deletions NGitLab.Mock/Config/GitLabHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,8 +940,7 @@ private static void CreateCommit(GitLabServer server, Project prj, GitLabCommit
{
var username = commit.User ?? commit.Parent.Parent.DefaultUser ?? throw new InvalidOperationException("Default user is required when author not set");
var user = server.Users.First(x => string.Equals(x.UserName, username, StringComparison.Ordinal));
var targetBranch = commit.TargetBranch;
if (string.IsNullOrEmpty(targetBranch))
if (string.IsNullOrEmpty(commit.TargetBranch))
{
var branchExists = string.IsNullOrEmpty(commit.SourceBranch) || prj.Repository.GetAllBranches().Any(x => string.Equals(x.FriendlyName, commit.SourceBranch, StringComparison.Ordinal));
if (!branchExists)
Expand All @@ -954,9 +953,9 @@ private static void CreateCommit(GitLabServer server, Project prj, GitLabCommit
}
else
{
prj.Repository.Merge(user, commit.SourceBranch, targetBranch);
prj.Repository.Merge(user, commit.SourceBranch, commit.TargetBranch);
if (commit.DeleteSourceBranch)
prj.Repository.RemoveBranch(targetBranch);
prj.Repository.RemoveBranch(commit.SourceBranch);
}

foreach (var tag in commit.Tags)
Expand Down