From b6295c700a770ff8014c6f00a2d37f8348f09e16 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Thu, 25 Jul 2019 11:24:53 -0700 Subject: [PATCH] go/utils/checkcommitters: Another pass at check_pr logic. --- go/utils/checkcommitters/check_pr.sh | 2 +- go/utils/checkcommitters/main.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go/utils/checkcommitters/check_pr.sh b/go/utils/checkcommitters/check_pr.sh index 7e6ded2727..9026d4f5bd 100755 --- a/go/utils/checkcommitters/check_pr.sh +++ b/go/utils/checkcommitters/check_pr.sh @@ -5,4 +5,4 @@ set -eo pipefail script_dir=$(dirname "$0") cd "$script_dir" -exec go run . $GIT_COMMIT $CHANGE_TARGET +exec go run . $BRANCH_NAME $CHANGE_TARGET diff --git a/go/utils/checkcommitters/main.go b/go/utils/checkcommitters/main.go index c76fc1e356..ea283ad55f 100644 --- a/go/utils/checkcommitters/main.go +++ b/go/utils/checkcommitters/main.go @@ -56,22 +56,22 @@ var AllowedCommitters = map[string]*struct{}{ func main() { if len(os.Args) != 3 { - fmt.Printf("Usage: checkcommitters GIT_COMMIT CHANGE_TARGET\n") - fmt.Printf(" GIT_COMMIT is the commit to be merged by the PR.\n") - fmt.Printf(" CHANGE_TARGET is the target branch, for example master.\n") + fmt.Printf("Usage: checkcommitters SOURCE_BRANCH TARGET_BRANCH\n") + fmt.Printf(" SOURCE_BRANCH is the remotes/origin branch to be merged by the PR, for example PR-4.\n") + fmt.Printf(" CHANGE_TARGET is the target remotes/origin branch of the PR, for example master.\n") fmt.Printf("This should be run from the git checkout workspace for the PR.\n") os.Exit(1) } - mbc := exec.Command("git", "merge-base", "remotes/origin/"+os.Args[2], os.Args[1]) + mbc := exec.Command("git", "merge-base", "remotes/origin/"+os.Args[2], "remotes/origin/"+os.Args[1]) mbco, err := mbc.CombinedOutput() if err != nil { - log.Fatalf("Error running `git merge-base remotes/origin/%s %s` to find merge parent: %v\n", os.Args[2], os.Args[1], err) + log.Fatalf("Error running `git merge-base remotes/origin/%s remotes/origin/%s` to find merge parent: %v\n", os.Args[2], os.Args[1], err) } base := strings.TrimSpace(string(mbco)) - lc := exec.Command("git", "log", "--format=full", base+".."+os.Args[1]) + lc := exec.Command("git", "log", "--format=full", base+"..remotes/origin/"+os.Args[1]) lco, err := lc.CombinedOutput() if err != nil { - log.Fatalf("Error running `git log --format=full %s..%s`: %v\n", base, os.Args[1], err) + log.Fatalf("Error running `git log --format=full %s..remotes/origin/%s`: %v\n", base, os.Args[1], err) } var failed bool