Skip to content

Fix hash keys in #describe #415

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 5, 2020
Merged

Fix hash keys in #describe #415

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbe629a
Fix hash keys in #describe
muellerj Jun 24, 2019
342e0b7
Merge branch 'master' into master
muellerj Sep 23, 2019
ce50308
Merge pull request #1 from ruby-git/master
muellerj Jan 13, 2020
e67d63d
Merge branch 'master' into master
muellerj Mar 6, 2020
621b41b
Merge branch 'master' into master
jcouball Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix hash keys in #describe 
Currently, the symbolized key is checked for presence and then the value for the non-symbolized one is used. This works for Hashes with indifferent access (like in rails etc.) but fails for a simple example like

```ruby
Git.open(".").describe("HEAD", abbrev: 0)

=> Git::GitExecuteError (git '--git-dir=/folder/to/repo/.git' '--work-tree=/folder/to/repo' describe '--abbrev=' 'HEAD'  2>&1:error: option `abbrev' expects a numerical value)
```

Changed all references to the symbolized version (since the method signature suggests `@param [{Symbol=>Object}]`).

Signed-off-by: Jonas Mueller <jonas-mueller@mailbox.org>
  • Loading branch information
@muellerj
muellerj authored and Jonas Mueller committed Aug 26, 2019
commit bbe629ae037f1f123fe3b782541f31027a89b6ff
10 changes: 5 additions & 5 deletions lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ def describe(committish=nil, opts={})
arr_opts << '--always' if opts[:always]
arr_opts << '--exact-match' if opts[:exact_match] || opts[:"exact-match"]

arr_opts << '--dirty' if opts['dirty'] == true
arr_opts << "--dirty=#{opts['dirty']}" if opts['dirty'].is_a?(String)
arr_opts << '--dirty' if opts[:dirty] == true
arr_opts << "--dirty=#{opts[:dirty]}" if opts['dirty'].is_a?(String)

arr_opts << "--abbrev=#{opts['abbrev']}" if opts[:abbrev]
arr_opts << "--candidates=#{opts['candidates']}" if opts[:candidates]
arr_opts << "--match=#{opts['match']}" if opts[:match]
arr_opts << "--abbrev=#{opts[:abbrev]}" if opts[:abbrev]
arr_opts << "--candidates=#{opts[:candidates]}" if opts[:candidates]
arr_opts << "--match=#{opts[:match]}" if opts[:match]

arr_opts << committish if committish

Expand Down