Skip to content
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.

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

add option for first-parent VCS flag (for publish/gh-pages only) #751

Closed

Conversation

msarahan
Copy link
Contributor

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.

@pv
Copy link
Collaborator

pv commented Oct 13, 2018

Seems to be same as #748

I'd prefer a flag --commit-history=first-parent/topo-date-order/... instead, because first-parent and "commits in topological date order" are not the only options. Alternatively, this could as well be a config file option --- it's probably not likely you'd need to change it that often.

@msarahan
Copy link
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.

@msarahan msarahan closed this Oct 13, 2018
@msarahan msarahan deleted the first-parent-flag branch October 13, 2018 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants