git_commands 3.3.2 → 3.3.3
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/computer.rb +0 -7
- data/lib/git_commands/repository.rb +4 -9
- 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: 4ad33ca845ac648e2761f3db92d014af3f6ace5d
|
|
4
|
+
data.tar.gz: 6ee733b4cd530e14eb84b5a8e06bcadbdb7f477d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 12627a0f046695c1e314c965134ec00c00ffa143317e43a0839fccc1f9fffac08ed3b65b34f952765c3fb2e25328ab7856e73d79dab324d6290630967a05a223
|
|
7
|
+
data.tar.gz: bf319f1c824ffa149dda539385b81b1a8f2ed8ab969733d2e56fca6f15ffd22884acc46a1cd231c6def4b3b440c345a7a68ccc8ffb8117e0fdbc0dd92d843148
|
|
@@ -81,13 +81,6 @@ module GitCommands
|
|
|
81
81
|
`git pull`
|
|
82
82
|
end
|
|
83
83
|
|
|
84
|
-
private def rebase_with_master
|
|
85
|
-
`git rebase origin/#{Branch::MASTER}`
|
|
86
|
-
return true unless @repo.locked?
|
|
87
|
-
@repo.unlock
|
|
88
|
-
error("Got conflicts, aborting rebase!")
|
|
89
|
-
end
|
|
90
|
-
|
|
91
84
|
private def rebase_with(branch = "#{Branch::ORIGIN}#{Branch::MASTER}")
|
|
92
85
|
`git rebase #{branch}`
|
|
93
86
|
return true unless @repo.locked?
|
|
@@ -19,27 +19,22 @@ module GitCommands
|
|
|
19
19
|
|
|
20
20
|
def locked?
|
|
21
21
|
LOCKING_FILES.any? do |name|
|
|
22
|
-
|
|
22
|
+
@path.join(".git", name).exist?
|
|
23
23
|
end
|
|
24
24
|
end
|
|
25
25
|
|
|
26
26
|
def unlock
|
|
27
|
-
Dir.chdir(
|
|
27
|
+
Dir.chdir(self) do
|
|
28
28
|
`git rebase --abort`
|
|
29
29
|
end
|
|
30
30
|
end
|
|
31
31
|
|
|
32
32
|
private def valid?
|
|
33
|
-
|
|
34
|
-
work_tree?
|
|
35
|
-
end
|
|
36
|
-
|
|
37
|
-
private def exists?
|
|
38
|
-
File.directory?(@path)
|
|
33
|
+
@path.directory? && work_tree?
|
|
39
34
|
end
|
|
40
35
|
|
|
41
36
|
private def work_tree?
|
|
42
|
-
Dir.chdir(
|
|
37
|
+
Dir.chdir(self) do
|
|
43
38
|
`git rev-parse --is-inside-work-tree 2> /dev/null`.strip == "true"
|
|
44
39
|
end
|
|
45
40
|
end
|
data/lib/git_commands/version.rb
CHANGED