admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

test-bot: update diff_start_sha1 unconditionally

Browse Source 
See bfab4b0e65db4667ab09159b1040701fa75ec687

Closes Homebrew/homebrew#44889.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-10-13 22:17:17 +08:00
parent d877fc0b3e
commit d1222971f6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cmd/test-bot.rb
View File

@ -318,12 +318,13 @@ module Homebrew
# Use Travis CI Git variables for master or branch jobs. # Use Travis CI Git variables for master or branch jobs.
elsif ENV["TRAVIS_COMMIT_RANGE"] elsif ENV["TRAVIS_COMMIT_RANGE"]
diff_start_sha1, diff_end_sha1 = ENV["TRAVIS_COMMIT_RANGE"].split "..." diff_start_sha1, diff_end_sha1 = ENV["TRAVIS_COMMIT_RANGE"].split "..."
diff_start_sha1 = git("merge-base", diff_start_sha1, diff_end_sha1).strip
# Otherwise just use the current SHA-1 (which may be overriden later) # Otherwise just use the current SHA-1 (which may be overriden later)
else else
diff_end_sha1 = diff_start_sha1 = current_sha1 diff_end_sha1 = diff_start_sha1 = current_sha1
end end
diff_start_sha1 = git("merge-base", diff_start_sha1, diff_end_sha1).strip
# Handle no arguments being passed on the command-line e.g. `brew test-bot`. # Handle no arguments being passed on the command-line e.g. `brew test-bot`.
if no_args? if no_args?
if diff_start_sha1 == diff_end_sha1 || \ if diff_start_sha1 == diff_end_sha1 || \