Skip to content

Improve ExecuteCore.ExecuteInternal when HEAD is not pointing at the desired branch #1291

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 5 commits into from
Sep 21, 2017
Merged

Improve ExecuteCore.ExecuteInternal when HEAD is not pointing at the desired branch #1291

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9e3c80
Improve ExecuteCore.ExecuteInternal to handle cases where HEAD is not…
Jericho Sep 7, 2017
dfa6c79
Move the logic which determines the desired branch to a new construct…
Jericho Sep 19, 2017
fb9c26d
Removed the GitVersionContext constructor which leads to issues when …
Jericho Sep 19, 2017
946ebbf
Reduce number of statements on one line, makes it easier to read
Jericho Sep 20, 2017
e7894ab
Move the logic to select the desired branch to its own static method.
Jericho Sep 20, 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
4 changes: 3 additions & 1 deletion src/GitVersionCore/GitVersionContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
public class GitVersionContext
{
public GitVersionContext(IRepository repository, string targetBranch, Config configuration, bool onlyEvaluateTrackedBranches = true, string commitId = null)
: this(repository, repository.Branches.SingleOrDefault(b => b.CanonicalName == targetBranch || b.FriendlyName == targetBranch) ?? repository.Head, configuration, onlyEvaluateTrackedBranches, commitId)
: this(repository,
repository.Branches.SingleOrDefault(b => b.CanonicalName == targetBranch || b.FriendlyName == targetBranch) ?? repository.Head,
configuration, onlyEvaluateTrackedBranches, commitId)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only now discovered that this all happens within a constructor. Sorry for not catching that earlier. Could you please add a static method that wraps repository.Branches.SingleOrDefault(b => b.CanonicalName == targetBranch || b.FriendlyName == targetBranch) ?? repository.Head and invoke that method from the constructor?

{
}

Expand Down