danger-additional-logging 0.0.10 → 0.0.11
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/danger/scm_source/git_repo.rb +9 -4
- data/lib/danger/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c396f0ffb2b47bd551cdefc999316ef06df744364dbbbebc595da5bbe3807bf5
|
4
|
+
data.tar.gz: c0e70fc51943f6a5d7f984a8b3c1be5d0ed79353bf179df927d50cd230f2f5ef
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 185d4c5208aa5c86c30f3fc38edd2d7ed503ccf27188404b260177e966233d2591f850ea9132202d9e061521df75e5d894bce7d780ca40f082bbd043d9d2697a
|
7
|
+
data.tar.gz: c19d20b4a5b24c1989ddfdbce69873bb9bc352ea030f34da02c2dd6a594061d13184ad6f5b6a99d8c3b6eb20ba03130c1cf71072457112cfaf7258d976a54ecb
|
@@ -150,11 +150,9 @@ module Danger
|
|
150
150
|
puts "find_merge_base(from=#{from}, to=#{to})"
|
151
151
|
|
152
152
|
possible_merge_base = possible_merge_base(repo, from, to)
|
153
|
-
puts "possible_merge_base result: #{possible_merge_base}"
|
154
153
|
return possible_merge_base if possible_merge_base
|
155
154
|
|
156
155
|
possible_merge_base = find_merge_base_with_incremental_fetch(repo, from, to)
|
157
|
-
puts "find_merge_base_with_incremental_fetch result: #{possible_merge_base}"
|
158
156
|
return possible_merge_base if possible_merge_base
|
159
157
|
|
160
158
|
git_in_depth_fetch
|
@@ -166,7 +164,7 @@ module Danger
|
|
166
164
|
end
|
167
165
|
|
168
166
|
def find_merge_base_with_incremental_fetch(repo, from, to)
|
169
|
-
puts "find_merge_base_with_incremental_fetch"
|
167
|
+
puts "find_merge_base_with_incremental_fetch(from=#{from}, to=#{to})"
|
170
168
|
|
171
169
|
from_is_ref = commit_is_ref?(from)
|
172
170
|
to_is_ref = commit_is_ref?(to)
|
@@ -184,6 +182,7 @@ module Danger
|
|
184
182
|
end
|
185
183
|
|
186
184
|
def possible_merge_base(repo, from, to)
|
185
|
+
puts "possible_merge_base(from=#{from}, to=#{to})"
|
187
186
|
[repo.merge_base(from, to)].find { |base| commit_exists?(base) }
|
188
187
|
end
|
189
188
|
|
@@ -222,7 +221,13 @@ module Git
|
|
222
221
|
# Use git-merge-base https://git-scm.com/docs/git-merge-base to
|
223
222
|
# find as good common ancestors as possible for a merge
|
224
223
|
def merge_base(commit1, commit2, *other_commits)
|
225
|
-
|
224
|
+
puts "will git merge-base commit1 #{commit1}, commit2 #{commit2}"
|
225
|
+
output = Open3.popen2("git", "merge-base", commit1, commit2, *other_commits) { |_stdin, stdout, _wait_thr| stdout.read.rstrip }
|
226
|
+
|
227
|
+
puts "Command output:"
|
228
|
+
puts output
|
229
|
+
|
230
|
+
output
|
226
231
|
end
|
227
232
|
end
|
228
233
|
end
|
data/lib/danger/version.rb
CHANGED