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

Inconsistency between Travis and local deploy #14

Closed
hroncok opened this issue Feb 14, 2017 · 4 comments · Fixed by #30
Closed

Inconsistency between Travis and local deploy #14

hroncok opened this issue Feb 14, 2017 · 4 comments · Fixed by #30
Labels

Comments

@hroncok
Copy link
Member

hroncok commented Feb 14, 2017

On Travis:

  • gh-pages is not pulled and a single commit is force pushed, the branch will have only one commit

Locally:

  • depending on your local state, the commit will be added on the top of gh-pages branch and force pushed

We can do one of the following:

  • fetch and reset before we commit (resulting in a history of deployments in gh-pages)
  • always remove the branch before committing (resulting in a single commit in gh-pages, consistent with README)
@encukou
Copy link
Member

encukou commented Feb 14, 2017

Or we can make it configurable.

I'd opt for keeping single commit, or defaulting to that.

@hroncok
Copy link
Member Author

hroncok commented Feb 22, 2017

I've decided making it configurable would add an unnecessary complexity for almost no reason. Went with the documented behavior.

@hroncok
Copy link
Member Author

hroncok commented Feb 22, 2017

Deleting the local branch is not enough. ghp-import checks origin/gh-pages and rebases on top of that https://github.com/davisp/ghp-import/blob/3fd376d66d1626da00c623193ff04169afb9c97f/ghp_import.py#L69

@hroncok hroncok reopened this Feb 22, 2017
@hroncok
Copy link
Member Author

hroncok commented Feb 22, 2017

It would need to do something like rm .git/refs/remotes/origin/gh-pages if origin is the right remote.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants