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

Test "The Game should complete the push level" fails with push.default == simple #128

Closed
courajs opened this issue Oct 30, 2013 · 6 comments

Comments

@courajs
Copy link
Contributor

courajs commented Oct 30, 2013

I got the tests running locally, but it seemed like about halfway through a test failed, and then all further tests failed. At the first failure I was getting this error text:

fatal: The current branch master has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin master

Looking at the same spot on the travis build I saw this:

warning: push.default is unset; its implicit value is changing in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use:
  git config --global push.default matching
blah blah blah

You can reproduce this locally:

  1. git config --global push.default matching
  2. bundle exec rake (tests pass)
  3. git config --global push.default simple
  4. bundle exec rake (tests fail)

This might be fixable with local config for the push level, or by more explicitly setting the upstream for that level, or something to that effect. I'll play around with it a bit.

@courajs
Copy link
Contributor Author

courajs commented Oct 30, 2013

Solved by any of #129, #130, or #131. I recommend #129 as it sets the repo up for an easy git push for the user, and I don't think the level was supposed to be about setting upstreams and tracking branches.

@courajs courajs closed this as completed Oct 30, 2013
@courajs courajs reopened this Oct 30, 2013
@Gazler
Copy link
Owner

Gazler commented Oct 30, 2013

@FellowMD I like it when people point out issues that revolve around different git configs as it is difficult to catch all the cases.

If you recommend #129 then lets do that. The original author is no longer on Github so we can't ask them.

@Gazler
Copy link
Owner

Gazler commented Oct 30, 2013

@FellowMD Which version of git are you using? I can't reproduce the issue locally.

I get:

error: Malformed value for push.default: simple
error: Must be one of nothing, matching, tracking or current.
fatal: bad config file line 16 in /home/gazler/.gitconfig

@courajs
Copy link
Contributor Author

courajs commented Oct 30, 2013

1.8.2

@Gazler
Copy link
Owner

Gazler commented Oct 31, 2013

@FellowMD Thanks for both raising and fixing this!

@Gazler Gazler closed this as completed Oct 31, 2013
@courajs
Copy link
Contributor Author

courajs commented Oct 31, 2013

No problem! I was just thinking about a month ago that this is how git should be taught, and then found githug like a week later.

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

No branches or pull requests

2 participants