From cd528e7203b649795113c7adc013f09a3b1aab73 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 26 Oct 2014 12:33:43 +0000 Subject: [PATCH] brew-test-bot: tweak pull request diff detection. Avoid accidentally including more changes than was intentional. --- Library/Homebrew/cmd/test-bot.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 742fda12db..518abc0cc8 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -236,8 +236,7 @@ module Homebrew test "brew", "update" if current_branch == "master" diff_end_sha1 = current_sha1 elsif @url - test "brew", "update" if current_branch == "master" - diff_start_sha1 = current_sha1 + test "brew", "update" if current_branch == "master" end # Handle Jenkins pull request builder plugin. @@ -259,7 +258,8 @@ module Homebrew diff_end_sha1 = @hash @name = @hash elsif @url - test "git", "checkout", current_sha1 + diff_start_sha1 = current_sha1 + test "git", "checkout", diff_start_sha1 test "brew", "pull", "--clean", @url diff_end_sha1 = current_sha1 @short_url = @url.gsub('https://github.com/', '')