git_commands 3.3.6 → 3.3.7

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
  SHA1:
3
- metadata.gz: c7ad6cc5cb4f56319b167d46000fd9aae6c488df
4
- data.tar.gz: 40b764af5a0fd9914418d8aac7a611b1ab364f7b
3
+ metadata.gz: 4b9df5d09769634c3dc383e862a2a0f6effe9141
4
+ data.tar.gz: 2e903481e8ad0a0a7efa12ccc018f55158d418eb
5
5
  SHA512:
6
- metadata.gz: 54b2cf2fcc5964eff675a54518907cbae2429ced9a89e555d7898b645ce2cf0ec210f0d84fbed0d6614f927b809f9722e6bbe9d3e55f9f991bf99100f316b68f
7
- data.tar.gz: 1f7f2946184cfb54406a82e5e0a8110d5f418925e594241d8e59b38d420265e7f79d88a0bd2010f82ddfb51abb1baa6f611e82f073afdf46e0babb531f664d8f
6
+ metadata.gz: 7430f5fcd09df1229cbc6dab10631e54a37cd6209df1a529910a18f89932ad62647ce07639932cc31633e576f10258f6372e192972381de8b6449ba69ee09aa9
7
+ data.tar.gz: 02a8e71e2f28e97f92eec396a25394e49afa2a156983f7ce5c595de98e2c7868f43ce9bb45eaa8945077e959d592f27dbcb2abeae9862811bcdb6acb0081bc46
data/README.md CHANGED
@@ -166,7 +166,7 @@ remove --repo=/temp/top_20 --branches=*obsolete*
166
166
 
167
167
  #### Aggregate
168
168
  This command aggregates all of the specified branches into a single one in case you want to create a release branch.
169
- The created release branch follows this naming convention: *release/yyyy_mm_dd*
169
+ The created aggregate branch follows this naming convention: *aggregate/yyyy_mm_dd*
170
170
  A confirmation is asked before aggregating.
171
171
 
172
172
  ```
@@ -50,21 +50,21 @@ module GitCommands
50
50
 
51
51
  def aggregate
52
52
  temp = "temp/#{@timestamp}"
53
- release = "release/#{@timestamp}"
54
- confirm("Aggregate branches into #{release}") do
53
+ target = "aggregate/#{@timestamp}"
54
+ confirm("Aggregate branches into #{target}") do
55
55
  enter_repo do
56
- `git branch #{release}`
56
+ `git branch #{target}`
57
57
  @branches.each do |branch|
58
58
  warning("Merging branch: #{branch}")
59
59
  `git checkout -b #{temp} origin/#{branch} --no-track`
60
- clean_and_exit([temp, release]) unless rebase_with
61
- clean_and_exit([temp]) unless rebase_with(release)
62
- `git checkout #{release}`
60
+ clean_and_exit([temp, target]) unless rebase_with
61
+ clean_and_exit([temp]) unless rebase_with(target)
62
+ `git checkout #{target}`
63
63
  `git merge #{temp}`
64
64
  `git branch -D #{temp}`
65
65
  end
66
66
  end
67
- success("#{release} branch created")
67
+ success("#{target} branch created")
68
68
  end
69
69
  end
70
70
 
@@ -1,3 +1,3 @@
1
1
  module GitCommands
2
- VERSION = "3.3.6"
2
+ VERSION = "3.3.7"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git_commands
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.6
4
+ version: 3.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - costajob