From af755fbe99df52bf6a0c84f8d2d12afbba0a42b8 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Fri, 31 Jul 2020 09:00:31 -0700
Subject: [PATCH] Move setFlagDefaults closer to flag code

---
 cmd/git-sync/main.go | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go
index 3d29303..1335dcf 100644
--- a/cmd/git-sync/main.go
+++ b/cmd/git-sync/main.go
@@ -200,6 +200,16 @@ func envDuration(key string, def time.Duration) time.Duration {
 	return def
 }
 
+func setFlagDefaults() {
+	// Force logging to stderr (from glog).
+	stderrFlag := flag.Lookup("logtostderr")
+	if stderrFlag == nil {
+		fmt.Fprintf(os.Stderr, "ERROR: can't find flag 'logtostderr'\n")
+		os.Exit(1)
+	}
+	stderrFlag.Value.Set("true")
+}
+
 func main() {
 	// In case we come up as pid 1, act as init.
 	if os.Getpid() == 1 {
@@ -216,7 +226,6 @@ func main() {
 	}
 
 	setFlagDefaults()
-
 	flag.Parse()
 
 	if *flVer {
@@ -400,16 +409,6 @@ func waitTime(seconds float64) time.Duration {
 	return time.Duration(int(seconds*1000)) * time.Millisecond
 }
 
-func setFlagDefaults() {
-	// Force logging to stderr.
-	stderrFlag := flag.Lookup("logtostderr")
-	if stderrFlag == nil {
-		fmt.Fprintf(os.Stderr, "can't find flag 'logtostderr'\n")
-		os.Exit(1)
-	}
-	stderrFlag.Value.Set("true")
-}
-
 // Do no work, but don't do something that triggers go's runtime into thinking
 // it is deadlocked.
 func sleepForever() {