git_commands 3.2.0 → 3.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 +4 -4
- data/lib/git_commands/command.rb +5 -3
- data/lib/git_commands/version.rb +1 -1
- 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: 6830212ac9292f6ab9a440be58462c0700e0aca5
|
|
4
|
+
data.tar.gz: 6dc1beacbc1d9d38805401e989f32810ac2b329b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 27b6cd41ea7fdb45082b63e2c4d9eb5f6f5cd4f300897eeb64e4347d45f73c0f787dbfaedf010c3c9645b4b6e0f333947f3fea3e1ce344c2042c7bb17eaf9114
|
|
7
|
+
data.tar.gz: b958bd9a4abd7833b8a42b6220b5ad238223a2aa363b835e92d575eb67c425f45c11548da74c31c669cbea11186111e0c12b9440312b91cff3adc22c62b6009b
|
data/lib/git_commands/command.rb
CHANGED
|
@@ -44,7 +44,7 @@ module GitCommands
|
|
|
44
44
|
warning("Rebasing branch: #{branch}")
|
|
45
45
|
`git checkout #{branch}`
|
|
46
46
|
`git pull origin #{branch}`
|
|
47
|
-
next unless rebase_with_master
|
|
47
|
+
next unless rebase_with_master(branch)
|
|
48
48
|
`git push -f origin #{branch}`
|
|
49
49
|
`git checkout #{Branch::MASTER}`
|
|
50
50
|
`git branch -D #{branch}`
|
|
@@ -63,7 +63,7 @@ module GitCommands
|
|
|
63
63
|
@branches.each do |branch|
|
|
64
64
|
warning("Merging branch: #{branch}")
|
|
65
65
|
`git checkout -b #{temp} origin/#{branch} --no-track`
|
|
66
|
-
next unless rebase_with_master
|
|
66
|
+
next unless rebase_with_master(branch)
|
|
67
67
|
`git rebase #{aggregate}`
|
|
68
68
|
`git checkout #{aggregate}`
|
|
69
69
|
`git merge #{temp}`
|
|
@@ -88,10 +88,12 @@ module GitCommands
|
|
|
88
88
|
`git pull`
|
|
89
89
|
end
|
|
90
90
|
|
|
91
|
-
private def rebase_with_master
|
|
91
|
+
private def rebase_with_master(branch)
|
|
92
92
|
`git rebase origin/#{Branch::MASTER}`
|
|
93
93
|
return true unless @repo.locked?
|
|
94
94
|
`git rebase --abort`
|
|
95
|
+
`git checkout #{Branch::MASTER}`
|
|
96
|
+
`git branch -D #{branch}`
|
|
95
97
|
error("Got conflicts, skipping rebase!")
|
|
96
98
|
end
|
|
97
99
|
|
data/lib/git_commands/version.rb
CHANGED