From 0e135a4759a3230a9ca05fc06001216648d0dacf Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 26 Jan 2017 21:13:02 -0800 Subject: [PATCH] main: Explicit -range implies -no-travis If someone went through the trouble to set -range, they probably don't want you clobbering their value with something from a TRAVIS_* environment variable. --- main.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 3de1fd9..486be86 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( ) var ( - flCommitRange = flag.String("range", "", "use this commit range instead") + flCommitRange = flag.String("range", "", "use this commit range instead (implies -no-travis)") flListRules = flag.Bool("list-rules", false, "list the rules registered") flRun = flag.String("run", "", "comma delimited list of rules to run. Defaults to all.") flVerbose = flag.Bool("v", false, "verbose") @@ -48,11 +48,13 @@ func main() { } var commitRange = *flCommitRange - if strings.ToLower(os.Getenv("TRAVIS")) == "true" && !*flNoTravis { - if os.Getenv("TRAVIS_COMMIT_RANGE") != "" { - commitRange = os.Getenv("TRAVIS_COMMIT_RANGE") - } else if os.Getenv("TRAVIS_COMMIT") != "" { - commitRange = os.Getenv("TRAVIS_COMMIT") + if commitRange == "" { + if strings.ToLower(os.Getenv("TRAVIS")) == "true" && !*flNoTravis { + if os.Getenv("TRAVIS_COMMIT_RANGE") != "" { + commitRange = os.Getenv("TRAVIS_COMMIT_RANGE") + } else if os.Getenv("TRAVIS_COMMIT") != "" { + commitRange = os.Getenv("TRAVIS_COMMIT") + } } }