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

Fix git init issue #37

Merged
merged 2 commits into from
Apr 14, 2018
Merged

Fix git init issue #37

merged 2 commits into from
Apr 14, 2018

Conversation

zommerfelds
Copy link
Contributor

Attempt to fix #36

@@ -238,6 +238,10 @@ var testCasesExtractBranch = []struct {
[]byte("## Initial commit on master"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure when this message gets printed. Is this for an older version of git? Maybe we should put a comment to describe how to replicate it in a real system.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if perhaps this is in fact the same message and it just changed text in more recent versions of git. Perhaps a search through the git codebase could tell us that.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah, looks like it was changed in git/git@4ddb135

@mroth
Copy link
Owner

mroth commented Mar 21, 2018

Awesome! Thanks for taking this on.

@zommerfelds
Copy link
Contributor Author

zommerfelds commented Mar 21, 2018 via email

@zommerfelds
Copy link
Contributor Author

Is there anything left to be done before we can merge this?

@mroth
Copy link
Owner

mroth commented Apr 13, 2018

Is there anything left to be done before we can merge this?

Sorry for the delay, I was out of the country.

The one thing I was thinking is that this is a case we should probably have an integration test for as well, so we automatically catch it if the language changes again or similar.

@zommerfelds
Copy link
Contributor Author

zommerfelds commented Apr 14, 2018

Good point. But actually, there is already a test case for it:

  Scenario: Banner shows no changes when in an unchanged git repo
    Given I am in a git repository
    When I successfully run `scmpuff status`
    Then the output should contain "No changes (working directory clean)"

So, currently the tests are not even passing on master with the newer git version. I created a PR below just to demonstrate this on CI: #36

@mroth
Copy link
Owner

mroth commented Apr 14, 2018

Oh great, I somehow forgot that integration test already existed. This should be ready to be merged then. Thanks so much for your contribution @zommerfelds !

@mroth mroth merged commit 2a49c9f into mroth:master Apr 14, 2018
@zommerfelds zommerfelds deleted the git-init-issue-36 branch April 16, 2018 01:25
@zommerfelds zommerfelds mentioned this pull request Apr 16, 2018
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.

Doesn't work properly when git just initialized
2 participants