fetchGit: Fix handling of local repo when not using 'master' branch #1755
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add tests checking this behavior.
shlevy
approved these changes
Dec 22, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add tests checking this behavior.
Currently,
fetchGitbehavior does the following when working on a local git checkout (with branches "master" and "dev"):fetchGit ./., HEAD=master, clean: -> masterfetchGit ./., HEAD=master, dirty -> master+changes to tracked filesfetchGit ./., HEAD=dev, clean -> master (!!)fetchGit ./., HEAD=dev, dirty -> dev+changes to tracked filesThis PR changes behavior so that the item marked (!!) above follows the pattern and uses "dev" instead of "master".
This is particularly relevant as of 6d80870: cloning nix, checking out a branch, committing changes, and then using release.nix to test it.... results in building 'master' instead! 馃槙