ruby-git-fw 1.3.0 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/git/lib.rb +3 -2
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 720f49735b458032497bcf99399120fb139771c0
4
- data.tar.gz: b0e072816bfb469fa09314857d67aae1e6ebed21
3
+ metadata.gz: 885691d922e91d8f6fff84ffdb950849ff29983a
4
+ data.tar.gz: 84f03afc63427186cb70fe6a68f0fbe0ffdcb95b
5
5
  SHA512:
6
- metadata.gz: 3811396b9d0ea1ae63ccd0f3b13c114cb2f65b5234b2686b41f06b79679e9d9c1cb4455d474ac5722b762494110ca62589c11ecb8da31ee3baae55723d901744
7
- data.tar.gz: de464331be9664bad705fac0016c1af1422c201fd4c2b81be783089128c0a34c727951c84c2a3a2b8509351f9c2a8dd19824e77416e24b32b2bc649d673cbb03
6
+ metadata.gz: 7c4818a5f104dcfc7aa7d0936065c5589c9229bfa5062670b1d98bc38dac439fd867370a0f928f71070caafcec9b8a52d325fd88463e8dd1377c4422be4ccc2a
7
+ data.tar.gz: 6ebf5737d37b1eeafe1173041d44755bbb13548f048cb2abbd8a984359944ee9fbaf5eabb08876814814a324606f3366a403d113e8ea0a1a3bf4ec5116820224
data/lib/git/lib.rb CHANGED
@@ -972,9 +972,10 @@ module Git
972
972
  def log_common_options(opts)
973
973
  arr_opts = []
974
974
 
975
- arr_opts << "-#{opts[:count]}" if opts[:count]
975
+ fw_count = opts[:count]
976
+ arr_opts << "-#{fw_count}" if fw_count
976
977
  arr_opts << "--no-color"
977
- arr_opts << "--diff-filter=ADM"
978
+ arr_opts << "--diff-filter=ADM" if fw_count && fw_count != "-merges"
978
979
  arr_opts << "--since=#{opts[:since]}" if opts[:since].is_a? String
979
980
  arr_opts << "--until=#{opts[:until]}" if opts[:until].is_a? String
980
981
  arr_opts << "--grep=#{opts[:grep]}" if opts[:grep].is_a? String
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby-git-fw
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon