git-whence 0.2.0 → 0.2.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bbf02d5c73586be8d70edcabecd451091376a8f4db383766fb6ed64768d97bfc
4
- data.tar.gz: 3c521c44e7fa1ece8af4b213940b1e61b96d7b4282cf90cbb94d9d54a5072a0c
3
+ metadata.gz: 3ff4eae5cbbb56bd17fdd8baa9a653bb45b68f70b1214358d6b595d1c5b8b829
4
+ data.tar.gz: de12ddbebc457c3e72c324b17242787c96c5c4243868042d3ba199706d4f19e1
5
5
  SHA512:
6
- metadata.gz: 6273c8f80e7fe4c56dd145294ac5eaa0dd950e9e530498414b1f0b87e54bcb1bd345e0fbef1aa1b2a816b608b14bc354e27dd868581920ee0e9e704f77533fbc
7
- data.tar.gz: 5291c1401f7a04428a0cdda6d26824d7f4547eeea3bc9a4268e92fbdf1f5e723b16d309d4d064851affe708f36faa004a4fb78de07d6f34eb3d867d018f6af3a
6
+ metadata.gz: 5a3193767c1a1cb822946ae91b9e4956294349669f32664364f62ea99806ad0af882e3313998bb2f8c3c5505c4a2daced0087af63858e0162fdca48a2a88902f
7
+ data.tar.gz: 7c6c048d81234fdeae88b330d768d6485bb5a5dd18a3c3f923d49aa2ba99a5196a22a268203d76be7ffe4882fb08d1f14b54f43b579e9a301868bcab55ce9680
data/lib/git/whence.rb CHANGED
@@ -16,14 +16,17 @@ module Git::Whence
16
16
 
17
17
  if is_merge?(commit)
18
18
  warn "Commit is a merge"
19
- finished_with_commit(commit, options)
19
+ show_commit(commit, options)
20
+ 1
20
21
  else
21
22
  merge = find_merge(commit)
22
23
  if merge
23
- finished_with_commit(merge, options)
24
+ show_commit(merge, options)
25
+ 0
24
26
  else
25
27
  warn "Unable to find merge"
26
- options[:open] ? finished_with_commit(commit, options) : 1
28
+ show_commit(commit, options) if options[:open]
29
+ 1
27
30
  end
28
31
  end
29
32
  end
@@ -38,7 +41,7 @@ module Git::Whence
38
41
  sh("git cat-file -p #{commit}").split("\n")[1..2].grep(/parent /).size > 1
39
42
  end
40
43
 
41
- def finished_with_commit(merge, options)
44
+ def show_commit(merge, options)
42
45
  info = sh("git show -s --oneline #{merge}").strip
43
46
  if options[:open]
44
47
  if pr = info[/Merge pull request #(\d+) from /, 1]
@@ -49,7 +52,6 @@ module Git::Whence
49
52
  end
50
53
  else
51
54
  puts info
52
- 0
53
55
  end
54
56
  end
55
57
 
@@ -1,5 +1,5 @@
1
1
  module Git
2
2
  module Whence
3
- VERSION = "0.2.0"
3
+ VERSION = "0.2.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-whence
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Grosser
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-18 00:00:00.000000000 Z
11
+ date: 2018-11-22 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description:
14
14
  email: michael@grosser.it