diff options
| author | Xu Cheng | 2015-10-13 22:17:17 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-10-14 00:04:57 +0800 |
| commit | d1222971f61b5e882571e303750da34fdee5a0cf (patch) | |
| tree | 8511ee87fb6349b1d6767997ea5ca91654a6a4f9 /Library | |
| parent | d877fc0b3efcf9a9df9d1532e69ae46b1ad35fbd (diff) | |
| download | brew-d1222971f61b5e882571e303750da34fdee5a0cf.tar.bz2 | |
test-bot: update diff_start_sha1 unconditionally
See bfab4b0e65db4667ab09159b1040701fa75ec687
Closes Homebrew/homebrew#44889.
Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index d4c9a6a61..cbe2a2698 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -318,12 +318,13 @@ module Homebrew # Use Travis CI Git variables for master or branch jobs. elsif ENV["TRAVIS_COMMIT_RANGE"] 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) else diff_end_sha1 = diff_start_sha1 = current_sha1 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`. if no_args? if diff_start_sha1 == diff_end_sha1 || \ |