git_commands 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ad6cc5cb4f56319b167d46000fd9aae6c488df
-  data.tar.gz: 40b764af5a0fd9914418d8aac7a611b1ab364f7b
+  metadata.gz: 4b9df5d09769634c3dc383e862a2a0f6effe9141
+  data.tar.gz: 2e903481e8ad0a0a7efa12ccc018f55158d418eb
 SHA512:
-  metadata.gz: 54b2cf2fcc5964eff675a54518907cbae2429ced9a89e555d7898b645ce2cf0ec210f0d84fbed0d6614f927b809f9722e6bbe9d3e55f9f991bf99100f316b68f
-  data.tar.gz: 1f7f2946184cfb54406a82e5e0a8110d5f418925e594241d8e59b38d420265e7f79d88a0bd2010f82ddfb51abb1baa6f611e82f073afdf46e0babb531f664d8f
+  metadata.gz: 7430f5fcd09df1229cbc6dab10631e54a37cd6209df1a529910a18f89932ad62647ce07639932cc31633e576f10258f6372e192972381de8b6449ba69ee09aa9
+  data.tar.gz: 02a8e71e2f28e97f92eec396a25394e49afa2a156983f7ce5c595de98e2c7868f43ce9bb45eaa8945077e959d592f27dbcb2abeae9862811bcdb6acb0081bc46

data/README.md

@@ -166,7 +166,7 @@ remove --repo=/temp/top_20 --branches=*obsolete*
 
 #### Aggregate
 This command aggregates all of the specified branches into a single one in case you want to create a release branch.  
-The created release branch follows this naming convention: *release/yyyy_mm_dd*  
+The created aggregate branch follows this naming convention: *aggregate/yyyy_mm_dd*  
 A confirmation is asked before aggregating.  
 
 ```

data/lib/git_commands/computer.rb

@@ -50,21 +50,21 @@ module GitCommands
 
     def aggregate
       temp = "temp/#{@timestamp}"
-      release = "release/#{@timestamp}"
-      confirm("Aggregate branches into #{release}") do
+      target = "aggregate/#{@timestamp}"
+      confirm("Aggregate branches into #{target}") do
         enter_repo do
-          `git branch #{release}`
+          `git branch #{target}`
           @branches.each do |branch|
             warning("Merging branch: #{branch}")
             `git checkout -b #{temp} origin/#{branch} --no-track`
-            clean_and_exit([temp, release]) unless rebase_with
-            clean_and_exit([temp]) unless rebase_with(release)
-            `git checkout #{release}`
+            clean_and_exit([temp, target]) unless rebase_with
+            clean_and_exit([temp]) unless rebase_with(target)
+            `git checkout #{target}`
             `git merge #{temp}`
             `git branch -D #{temp}`
           end      
         end
-        success("#{release} branch created")
+        success("#{target} branch created")
       end
     end
 

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.3.6"
+  VERSION = "3.3.7"
 end

metadata

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