git-conflict-blame 0.2.0 → 0.3.0
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 +4 -4
- data/README.md +23 -3
- data/lib/git-conflict-blame/version.rb +1 -1
- data/lib/git-conflict-blame.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1aaff5d4d0b2c39f6bd51e0b29a6f23f757de471
|
|
4
|
+
data.tar.gz: 95ff5ca77ded3184bba06a5e3464665dc2977f7b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fe0ab5aa285ded320e96b81c85dbba296620cf2ef59f42f83b798c4aa0de78ebeb63e31e3355722bfa1384a7908b3a481d6b00f7b287fcad7f5943b6a90c74f2
|
|
7
|
+
data.tar.gz: 9f47d3305bc137c1e8840c5707c5ec7d97fbbb251e62c8d2df3df6db369d8086d5767ad577bf3661cc6a222afd3afa1276c1626d0b6428f15c76afa5f08dd477
|
data/README.md
CHANGED
|
@@ -5,12 +5,32 @@ after a `git merge` command has been ran and there are files that are in conflic
|
|
|
5
5
|
|
|
6
6
|
## Installation
|
|
7
7
|
|
|
8
|
+
```bash
|
|
9
|
+
gem install git-conflict-blame
|
|
10
|
+
```
|
|
11
|
+
|
|
8
12
|
This gem depends on [Rugged](http://www.rubydoc.info/gems/rugged), which requires
|
|
9
|
-
certain dependencies installed. Make sure you have `cmake
|
|
10
|
-
|
|
13
|
+
certain dependencies installed. Make sure you have `cmake` installed on your system.
|
|
14
|
+
|
|
15
|
+
If you get an error like this:
|
|
16
|
+
|
|
17
|
+
```
|
|
18
|
+
ERROR: Error installing git-conflict-blame:
|
|
19
|
+
ERROR: Failed to build gem native extension.
|
|
20
|
+
checking for gmake... no
|
|
21
|
+
checking for make... yes
|
|
22
|
+
checking for cmake... no
|
|
23
|
+
ERROR: CMake is required to build Rugged.
|
|
24
|
+
*** extconf.rb failed ***
|
|
25
|
+
Could not create Makefile due to some reason, probably lack of necessary
|
|
26
|
+
libraries and/or headers. Check the mkmf.log file for more details. You may
|
|
27
|
+
need configuration options.
|
|
28
|
+
```
|
|
29
|
+
|
|
30
|
+
Try running this (if you are on a Debian-based OS):
|
|
11
31
|
|
|
12
32
|
```bash
|
|
13
|
-
|
|
33
|
+
sudo apt-get install cmake
|
|
14
34
|
```
|
|
15
35
|
|
|
16
36
|
## Usage
|
data/lib/git-conflict-blame.rb
CHANGED
|
@@ -28,7 +28,7 @@ class GitConflictBlame
|
|
|
28
28
|
def run!
|
|
29
29
|
Dir.chdir( @repo.workdir )
|
|
30
30
|
raise GitError, 'No conflicts found' unless conflicts?
|
|
31
|
-
log "#{conflicts.count}
|
|
31
|
+
log "#{conflicts.count} files in conflict found!".red
|
|
32
32
|
log "Parsing files to find out who is to blame..."
|
|
33
33
|
data = find_conflict_blames
|
|
34
34
|
if @json
|
|
@@ -74,7 +74,7 @@ class GitConflictBlame
|
|
|
74
74
|
#
|
|
75
75
|
# @param e [Exception]
|
|
76
76
|
# @param message [String] Error message
|
|
77
|
-
def log_error( e, message: )
|
|
77
|
+
def log_error( e, message: '' )
|
|
78
78
|
if @json
|
|
79
79
|
message = "#{e.message}\n#{message}"
|
|
80
80
|
error_hash = {
|