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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing issues with a HEREDOC entry in git.status #385

Merged
merged 4 commits into from
Dec 22, 2020
Merged

fixing issues with a HEREDOC entry in git.status #385

merged 4 commits into from
Dec 22, 2020

Conversation

tarcinil
Copy link
Contributor

Your checklist for this pull request

馃毃Please review the guidelines for contributing to this repository.

  • Ensure all commits include DCO sign-off.
  • Ensure that your contributions pass unit testing.
  • Ensure that your contributions contain documentation if applicable.

Description

fix #384

Removes `#strip_heredoc

This change breaks Ruby 2.2 or less and the <<~ only exists in Ruby 2.3+. We are only testing Ruby 2.3 and later in Travis CI and I would argue that we should only be supporting those in the newer versions of the gem.

Fixing branch for a message being used interpreted as an arg list and not as a decomposed argument

Code/ruby-git/lib/git/branch.rb:40: warning: parentheses after method name is interpreted as an argument list, not a decomposed argument

* fixing status#pretty using <<~ because we only maintain on Ruby 2.3+ now
* fixing a rake warning about branch not using a decomposed argument

Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
@tarcinil tarcinil requested a review from a team August 28, 2018 17:36
@stale
Copy link

stale bot commented Oct 27, 2018

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the wontfix label Oct 27, 2018
@tarcinil tarcinil added pinned and removed wontfix labels Oct 29, 2018
Copy link
Member

@jcouball jcouball left a comment

Choose a reason for hiding this comment

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

At first I was concerned that dropping older versions of Ruby should require a MAJOR version bump. After some reading, I think it is something to consider, but might not be necessary.

Here is the discussion I found helpful:
https://www.reddit.com/r/ruby/comments/7vtceq/when_is_it_okay_to_drop_support_for_ruby_versions/

@tarcinil
Copy link
Contributor Author

@jcouball - I don't have an argument either way, I would be fine with a MINOR. The change in the gemspec should preventbundle from allowing users to update if they don't have Ruby 2.3+. The overall API of the method is staying the same, and it is being removing a dependency on a rails only function (#strip_heredoc) which we do not include.

@jcouball
Copy link
Member

Let's let this PR go with just a patch version bump. By semver definition, that is all that is needed.

@stephengroat stephengroat mentioned this pull request May 30, 2019
3 tasks
@stephengroat
Copy link

any status on this?

@jcouball jcouball merged commit 8345fec into ruby-git:master Dec 22, 2020
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.

repo.status.pretty fails
3 participants