git_commands 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdad6f742ea09e2b50d560714ee7a74b7848ffc5
-  data.tar.gz: 88697a5add19a72d6cbb0602e1ee423aa6bcbb6b
+  metadata.gz: 2936c4e9f2983c15ed57ca5771dfa518d2aeecd9
+  data.tar.gz: 095c33cffbb33c11c3069b62607892e8db2944fe
 SHA512:
-  metadata.gz: 90a1dbe956bb86468132c4993d2443ead432a6998dcaf6f1e64f320971a97bf466bbdee99dc81ae7b854f40782299bab8ad357bc5644adfceca07fe20db4483f
-  data.tar.gz: 38774eda256e02d2e4ba318de4e031862392ab9ecbb785121b0525dd8df05331627e42ba68e02ebeaf51f5f8da9f9156a389fb43aacc2215266f1ae6f930fdf3
+  metadata.gz: a88f137909b4d8607af9cb674eac69008e7fa88c9cbcd18403416a704cc50a1bd03f45d5dc1e03834ac7a1c7f1ba0884a2e558292791567cc0f8fd5e3e964e05
+  data.tar.gz: f57c3a817cdb54dd6a9428071d2dc90baf5d905bd0d1aa1a190046ac1a2608132e2fe5e06562fb4588d567adc49f6ccba6e3bb49df0af3983c375891027c9b73

data/README.md

@@ -55,7 +55,7 @@ Usage: rebase --repo=/Users/Elvis/greatest_hits --branches=feature/love_me_tende
 ```
 
 #### Repository
-You have to specify the path (absolute or relative) to the GIT repository you want to work with. The path must be a folder initialized as a valid GIT repository (a check via *rev-parse* is performed), otherwise an error is raised:
+You have to specify the absolute path to the GIT repository you want to work with. The path must be a folder initialized as a valid GIT repository (a check via *rev-parse* is performed), otherwise an error is raised:
 
 ```
 rebase --repo=invalid
@@ -79,7 +79,7 @@ Successfully loaded 3 branches:
 ```
 
 ##### Path to a names file
-Specify a path (absolute or relative) to a file containing the branches names on each line:
+Specify an absolute path to a file containing the branches names on each line:
 
 File */Users/Elvis/greatest_hits/.branches*:
 ```
@@ -127,8 +127,7 @@ Successfully loaded 1 branch:
 In case no branches have been loaded, an error is raised:
 
 ```
-cd /Users/Elvis
-rebase --repo=./greatest_hits --branches=noent1, noent2
+rebase --repo=/Users/Elvis/greatest_hits --branches=noent1,noent2
 No branches loaded!
 ```
 

data/lib/git_commands/command.rb

@@ -88,7 +88,7 @@ module GitCommands
     private def rebase_with_master
       `git rebase origin/#{Branch::MASTER}`
       return true unless @repo.locked?
-      `git rebase --abort`
+      @repo.unlock
       error("Got conflicts, aborting rebase!")
     end
 

data/lib/git_commands/repository.rb

@@ -21,6 +21,12 @@ module GitCommands
       end
     end
 
+    def unlock
+      Dir.chdir(@path) do
+        `git rebase --abort`
+      end
+    end
+
     private def valid?
       return false unless exists?
       work_tree?

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.5"
+  VERSION = "3.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - costajob