add option for first-parent VCS flag (for publish/gh-pages only)#751
Closed
msarahan wants to merge 1 commit into
Closed
add option for first-parent VCS flag (for publish/gh-pages only)#751msarahan wants to merge 1 commit into
msarahan wants to merge 1 commit into
Conversation
Collaborator
|
Seems to be same as #748 I'd prefer a flag |
Contributor
Author
|
Indeed, sorry for not reviewing other PRs before putting this one up. Closing in favor of #748 If I can help on that one at all, please let me know. |
This file contains hidden or 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
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.
Conda's repo strategy is to branch off at releases and keep "merging up" so that master always contains all the commits from the past. The --first-parent flag passed to git by ASV gets confused by this, and only shows stuff that has actually been committed on master (that's what it's for, I guess). We wanted a way to not pass that flag, so that all of our commits show up on master.
This PR adds an option to disable passing that flag to git, or its equivalent to mercurial. The default behavior does not change. This PR only affects the behavior of the "publish" and "gh-pages" commands.