Merge pull request #883 from thockin/master

k8s-ci-robot · web-flow · commit e027ef64ac0f · 2024-06-10T14:14:46.000-07:00
Clean up flag-related messages
diff --git a/env.go b/env.go
@@ -60,7 +60,7 @@ func envBoolOrError(def bool, key string, alts ...string) (bool, error) {
 		if err == nil {
 			return parsed, nil
 		}
-		return false, fmt.Errorf("ERROR: invalid bool env %s=%q: %w", key, val, err)
+		return false, fmt.Errorf("invalid bool env %s=%q: %w", key, val, err)
 	}
 
 	if val := os.Getenv(key); val != "" {
@@ -77,7 +77,7 @@ func envBoolOrError(def bool, key string, alts ...string) (bool, error) {
 func envBool(def bool, key string, alts ...string) bool {
 	val, err := envBoolOrError(def, key, alts...)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)
 		os.Exit(1)
 		return false
 	}
@@ -90,7 +90,7 @@ func envIntOrError(def int, key string, alts ...string) (int, error) {
 		if err == nil {
 			return int(parsed), nil
 		}
-		return 0, fmt.Errorf("ERROR: invalid int env %s=%q: %w", key, val, err)
+		return 0, fmt.Errorf("invalid int env %s=%q: %w", key, val, err)
 	}
 
 	if val := os.Getenv(key); val != "" {
@@ -107,7 +107,7 @@ func envIntOrError(def int, key string, alts ...string) (int, error) {
 func envInt(def int, key string, alts ...string) int {
 	val, err := envIntOrError(def, key, alts...)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)
 		os.Exit(1)
 		return 0
 	}
@@ -120,7 +120,7 @@ func envFloatOrError(def float64, key string, alts ...string) (float64, error) {
 		if err == nil {
 			return parsed, nil
 		}
-		return 0, fmt.Errorf("ERROR: invalid float env %s=%q: %w", key, val, err)
+		return 0, fmt.Errorf("invalid float env %s=%q: %w", key, val, err)
 	}
 
 	if val := os.Getenv(key); val != "" {
@@ -137,7 +137,7 @@ func envFloatOrError(def float64, key string, alts ...string) (float64, error) {
 func envFloat(def float64, key string, alts ...string) float64 {
 	val, err := envFloatOrError(def, key, alts...)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)
 		os.Exit(1)
 		return 0
 	}
@@ -150,7 +150,7 @@ func envDurationOrError(def time.Duration, key string, alts ...string) (time.Dur
 		if err == nil {
 			return parsed, nil
 		}
-		return 0, fmt.Errorf("ERROR: invalid duration env %s=%q: %w", key, val, err)
+		return 0, fmt.Errorf("invalid duration env %s=%q: %w", key, val, err)
 	}
 
 	if val := os.Getenv(key); val != "" {
@@ -167,7 +167,7 @@ func envDurationOrError(def time.Duration, key string, alts ...string) (time.Dur
 func envDuration(def time.Duration, key string, alts ...string) time.Duration {
 	val, err := envDurationOrError(def, key, alts...)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)
 		os.Exit(1)
 		return 0
 	}
diff --git a/main.go b/main.go
@@ -131,7 +131,7 @@ func main() {
 		if err == nil {
 			os.Exit(code)
 		}
-		fmt.Fprintf(os.Stderr, "ERROR: unhandled pid1 error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "FATAL: unhandled pid1 error: %v\n", err)
 		os.Exit(127)
 	}
 
@@ -352,7 +352,7 @@ func main() {
 	}
 	var absRoot absPath
 	if abs, err := absPath(*flRoot).Canonical(); err != nil {
-		fmt.Fprintf(os.Stderr, "ERROR: can't absolutize --root: %v\n", err)
+		fmt.Fprintf(os.Stderr, "FATAL: can't absolutize --root: %v\n", err)
 		os.Exit(1)
 	} else {
 		absRoot = abs
@@ -370,40 +370,40 @@ func main() {
 	cmdRunner := cmd.NewRunner(log)
 
 	if *flRepo == "" {
-		handleConfigError(log, true, "ERROR: --repo must be specified")
+		fatalConfigError(log, true, "required flag: --repo must be specified")
 	}
 
 	switch {
 	case *flDeprecatedBranch != "" && (*flDeprecatedRev == "" || *flDeprecatedRev == "HEAD"):
 		// Back-compat
 		log.V(0).Info("setting --ref from deprecated --branch")
 		*flRef = *flDeprecatedBranch
-	case *flDeprecatedRev != "":
+	case *flDeprecatedRev != "" && *flDeprecatedBranch == "":
 		// Back-compat
 		log.V(0).Info("setting --ref from deprecated --rev")
 		*flRef = *flDeprecatedRev
 	case *flDeprecatedBranch != "" && *flDeprecatedRev != "":
-		handleConfigError(log, true, "ERROR: can't set --ref from deprecated --branch and --rev")
+		fatalConfigError(log, true, "deprecated flag combo: can't set --ref from deprecated --branch and --rev (one or the other is OK)")
 	}
 
 	if *flRef == "" {
-		handleConfigError(log, true, "ERROR: --ref must be specified")
+		fatalConfigError(log, true, "required flag: --ref must be specified")
 	}
 
 	if *flDepth < 0 { // 0 means "no limit"
-		handleConfigError(log, true, "ERROR: --depth must be greater than or equal to 0")
+		fatalConfigError(log, true, "invalid flag: --depth must be greater than or equal to 0")
 	}
 
 	switch submodulesMode(*flSubmodules) {
 	case submodulesRecursive, submodulesShallow, submodulesOff:
 	default:
-		handleConfigError(log, true, "ERROR: --submodules must be one of %q, %q, or %q", submodulesRecursive, submodulesShallow, submodulesOff)
+		fatalConfigError(log, true, "invalid flag: --submodules must be one of %q, %q, or %q", submodulesRecursive, submodulesShallow, submodulesOff)
 	}
 
 	switch *flGitGC {
 	case gcAuto, gcAlways, gcAggressive, gcOff:
 	default:
-		handleConfigError(log, true, "ERROR: --git-gc must be one of %q, %q, %q, or %q", gcAuto, gcAlways, gcAggressive, gcOff)
+		fatalConfigError(log, true, "invalid flag: --git-gc must be one of %q, %q, %q, or %q", gcAuto, gcAlways, gcAggressive, gcOff)
 	}
 
 	if *flDeprecatedDest != "" {
@@ -422,11 +422,11 @@ func main() {
 		*flPeriod = time.Duration(int(*flDeprecatedWait*1000)) * time.Millisecond
 	}
 	if *flPeriod < 10*time.Millisecond {
-		handleConfigError(log, true, "ERROR: --period must be at least 10ms")
+		fatalConfigError(log, true, "invalid flag: --period must be at least 10ms")
 	}
 
 	if *flDeprecatedChmod != 0 {
-		handleConfigError(log, true, "ERROR: --change-permissions is no longer supported")
+		fatalConfigError(log, true, "deprecated flag: --change-permissions is no longer supported")
 	}
 
 	var syncSig syscall.Signal
@@ -443,7 +443,7 @@ func main() {
 			}
 		}
 		if syncSig == 0 {
-			handleConfigError(log, true, "ERROR: --sync-on-signal must be a valid signal name or number")
+			fatalConfigError(log, true, "invalid flag: --sync-on-signal must be a valid signal name or number")
 		}
 	}
 
@@ -453,7 +453,7 @@ func main() {
 		*flSyncTimeout = time.Duration(*flDeprecatedTimeout) * time.Second
 	}
 	if *flSyncTimeout < 10*time.Millisecond {
-		handleConfigError(log, true, "ERROR: --sync-timeout must be at least 10ms")
+		fatalConfigError(log, true, "invalid flag: --sync-timeout must be at least 10ms")
 	}
 
 	if *flDeprecatedMaxSyncFailures != 0 {
@@ -469,10 +469,10 @@ func main() {
 	}
 	if *flExechookCommand != "" {
 		if *flExechookTimeout < time.Second {
-			handleConfigError(log, true, "ERROR: --exechook-timeout must be at least 1s")
+			fatalConfigError(log, true, "invalid flag: --exechook-timeout must be at least 1s")
 		}
 		if *flExechookBackoff < time.Second {
-			handleConfigError(log, true, "ERROR: --exechook-backoff must be at least 1s")
+			fatalConfigError(log, true, "invalid flag: --exechook-backoff must be at least 1s")
 		}
 	}
 
@@ -482,60 +482,60 @@ func main() {
 			*flWebhookStatusSuccess = 0
 		}
 		if *flWebhookStatusSuccess < 0 {
-			handleConfigError(log, true, "ERROR: --webhook-success-status must be a valid HTTP code or 0")
+			fatalConfigError(log, true, "invalid flag: --webhook-success-status must be a valid HTTP code or 0")
 		}
 		if *flWebhookTimeout < time.Second {
-			handleConfigError(log, true, "ERROR: --webhook-timeout must be at least 1s")
+			fatalConfigError(log, true, "invalid flag: --webhook-timeout must be at least 1s")
 		}
 		if *flWebhookBackoff < time.Second {
-			handleConfigError(log, true, "ERROR: --webhook-backoff must be at least 1s")
+			fatalConfigError(log, true, "invalid flag: --webhook-backoff must be at least 1s")
 		}
 	}
 
 	if *flUsername != "" {
 		if *flPassword == "" && *flPasswordFile == "" {
-			handleConfigError(log, true, "ERROR: --password or --password-file must be specified when --username is specified")
+			fatalConfigError(log, true, "required flag: --password or --password-file must be specified when --username is specified")
 		}
 		if *flPassword != "" && *flPasswordFile != "" {
-			handleConfigError(log, true, "ERROR: only one of --password and --password-file may be specified")
+			fatalConfigError(log, true, "invalid flag: only one of --password and --password-file may be specified")
 		}
 		if u, err := url.Parse(*flRepo); err == nil { // it may not even parse as a URL, that's OK
 			if u.User != nil {
-				handleConfigError(log, true, "ERROR: credentials may not be specified in --repo when --username is specified")
+				fatalConfigError(log, true, "invalid flag: credentials may not be specified in --repo when --username is specified")
 			}
 		}
 	} else {
 		if *flPassword != "" {
-			handleConfigError(log, true, "ERROR: --password may only be specified when --username is specified")
+			fatalConfigError(log, true, "invalid flag: --password may only be specified when --username is specified")
 		}
 		if *flPasswordFile != "" {
-			handleConfigError(log, true, "ERROR: --password-file may only be specified when --username is specified")
+			fatalConfigError(log, true, "invalid flag: --password-file may only be specified when --username is specified")
 		}
 	}
 
 	if len(*flCredentials) > 0 {
 		for _, cred := range *flCredentials {
 			if cred.URL == "" {
-				handleConfigError(log, true, "ERROR: --credential URL must be specified")
+				fatalConfigError(log, true, "invalid flag: --credential URL must be specified")
 			}
 			if cred.Username == "" {
-				handleConfigError(log, true, "ERROR: --credential username must be specified")
+				fatalConfigError(log, true, "invalid flag: --credential username must be specified")
 			}
 			if cred.Password == "" && cred.PasswordFile == "" {
-				handleConfigError(log, true, "ERROR: --credential password or password-file must be set")
+				fatalConfigError(log, true, "invalid flag: --credential password or password-file must be specified")
 			}
 			if cred.Password != "" && cred.PasswordFile != "" {
-				handleConfigError(log, true, "ERROR: only one of --credential password and password-file may be specified")
+				fatalConfigError(log, true, "invalid flag: only one of --credential password and password-file may be specified")
 			}
 		}
 	}
 
 	if *flHTTPBind == "" {
 		if *flHTTPMetrics {
-			handleConfigError(log, true, "ERROR: --http-bind must be specified when --http-metrics is set")
+			fatalConfigError(log, true, "required flag: --http-bind must be specified when --http-metrics is set")
 		}
 		if *flHTTPprof {
-			handleConfigError(log, true, "ERROR: --http-bind must be specified when --http-pprof is set")
+			fatalConfigError(log, true, "required flag: --http-bind must be specified when --http-pprof is set")
 		}
 	}
 
@@ -552,7 +552,7 @@ func main() {
 		"flags", logSafeFlags(*flVerbose))
 
 	if _, err := exec.LookPath(*flGitCmd); err != nil {
-		log.Error(err, "ERROR: git executable not found", "git", *flGitCmd)
+		log.Error(err, "FATAL: git executable not found", "git", *flGitCmd)
 		os.Exit(1)
 	}
 
@@ -568,13 +568,13 @@ func main() {
 	// very early so that we can normalize the path even when there are
 	// symlinks in play.
 	if err := os.MkdirAll(absRoot.String(), defaultDirMode); err != nil {
-		log.Error(err, "ERROR: can't make root dir", "path", absRoot)
+		log.Error(err, "FATAL: can't make root dir", "path", absRoot)
 		os.Exit(1)
 	}
 	// Get rid of symlinks in the root path to avoid getting confused about
 	// them later.  The path must exist for EvalSymlinks to work.
 	if delinked, err := filepath.EvalSymlinks(absRoot.String()); err != nil {
-		log.Error(err, "ERROR: can't normalize root path", "path", absRoot)
+		log.Error(err, "FATAL: can't normalize root path", "path", absRoot)
 		os.Exit(1)
 	} else {
 		absRoot = absPath(delinked)
@@ -617,7 +617,7 @@ func main() {
 
 	if *flAddUser {
 		if err := addUser(); err != nil {
-			log.Error(err, "ERROR: can't add user")
+			log.Error(err, "FATAL: can't add user")
 			os.Exit(1)
 		}
 	}
@@ -653,7 +653,7 @@ func main() {
 
 	// Don't pollute the user's .gitconfig if this is being run directly.
 	if f, err := os.CreateTemp("", "git-sync.gitconfig.*"); err != nil {
-		log.Error(err, "ERROR: can't create gitconfig file")
+		log.Error(err, "FATAL: can't create gitconfig file")
 		os.Exit(1)
 	} else {
 		gitConfig := f.Name()
@@ -1062,10 +1062,10 @@ func sleepForever() {
 	os.Exit(0)
 }
 
-// handleConfigError prints the error to the standard error, prints the usage
+// fatalConfigError prints the error to the standard error, prints the usage
 // if the `printUsage` flag is true, exports the error to the error file and
 // exits the process with the exit code.
-func handleConfigError(log *logging.Logger, printUsage bool, format string, a ...interface{}) {
+func fatalConfigError(log *logging.Logger, printUsage bool, format string, a ...interface{}) {
 	s := fmt.Sprintf(format, a...)
 	fmt.Fprintln(os.Stderr, s)
 	if printUsage {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func envBoolOrError(def bool, key string, alts ...string) (bool, error) {`
`60`	`60`	`if err == nil {`
`61`	`61`	`return parsed, nil`
`62`	`62`	`}`
`63`		`- return false, fmt.Errorf("ERROR: invalid bool env %s=%q: %w", key, val, err)`
	`63`	`+ return false, fmt.Errorf("invalid bool env %s=%q: %w", key, val, err)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if val := os.Getenv(key); val != "" {`
`@@ -77,7 +77,7 @@ func envBoolOrError(def bool, key string, alts ...string) (bool, error) {`
`77`	`77`	`func envBool(def bool, key string, alts ...string) bool {`
`78`	`78`	`val, err := envBoolOrError(def, key, alts...)`
`79`	`79`	`if err != nil {`
`80`		`- fmt.Fprintln(os.Stderr, err)`
	`80`	`+ fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)`
`81`	`81`	`os.Exit(1)`
`82`	`82`	`return false`
`83`	`83`	`}`
`@@ -90,7 +90,7 @@ func envIntOrError(def int, key string, alts ...string) (int, error) {`
`90`	`90`	`if err == nil {`
`91`	`91`	`return int(parsed), nil`
`92`	`92`	`}`
`93`		`- return 0, fmt.Errorf("ERROR: invalid int env %s=%q: %w", key, val, err)`
	`93`	`+ return 0, fmt.Errorf("invalid int env %s=%q: %w", key, val, err)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if val := os.Getenv(key); val != "" {`
`@@ -107,7 +107,7 @@ func envIntOrError(def int, key string, alts ...string) (int, error) {`
`107`	`107`	`func envInt(def int, key string, alts ...string) int {`
`108`	`108`	`val, err := envIntOrError(def, key, alts...)`
`109`	`109`	`if err != nil {`
`110`		`- fmt.Fprintln(os.Stderr, err)`
	`110`	`+ fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)`
`111`	`111`	`os.Exit(1)`
`112`	`112`	`return 0`
`113`	`113`	`}`
`@@ -120,7 +120,7 @@ func envFloatOrError(def float64, key string, alts ...string) (float64, error) {`
`120`	`120`	`if err == nil {`
`121`	`121`	`return parsed, nil`
`122`	`122`	`}`
`123`		`- return 0, fmt.Errorf("ERROR: invalid float env %s=%q: %w", key, val, err)`
	`123`	`+ return 0, fmt.Errorf("invalid float env %s=%q: %w", key, val, err)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if val := os.Getenv(key); val != "" {`
`@@ -137,7 +137,7 @@ func envFloatOrError(def float64, key string, alts ...string) (float64, error) {`
`137`	`137`	`func envFloat(def float64, key string, alts ...string) float64 {`
`138`	`138`	`val, err := envFloatOrError(def, key, alts...)`
`139`	`139`	`if err != nil {`
`140`		`- fmt.Fprintln(os.Stderr, err)`
	`140`	`+ fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)`
`141`	`141`	`os.Exit(1)`
`142`	`142`	`return 0`
`143`	`143`	`}`
`@@ -150,7 +150,7 @@ func envDurationOrError(def time.Duration, key string, alts ...string) (time.Dur`
`150`	`150`	`if err == nil {`
`151`	`151`	`return parsed, nil`
`152`	`152`	`}`
`153`		`- return 0, fmt.Errorf("ERROR: invalid duration env %s=%q: %w", key, val, err)`
	`153`	`+ return 0, fmt.Errorf("invalid duration env %s=%q: %w", key, val, err)`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`if val := os.Getenv(key); val != "" {`
`@@ -167,7 +167,7 @@ func envDurationOrError(def time.Duration, key string, alts ...string) (time.Dur`
`167`	`167`	`func envDuration(def time.Duration, key string, alts ...string) time.Duration {`
`168`	`168`	`val, err := envDurationOrError(def, key, alts...)`
`169`	`169`	`if err != nil {`
`170`		`- fmt.Fprintln(os.Stderr, err)`
	`170`	`+ fmt.Fprintf(os.Stderr, "FATAL: %v\n", err)`
`171`	`171`	`os.Exit(1)`
`172`	`172`	`return 0`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func main() {`
`131`	`131`	`if err == nil {`
`132`	`132`	`os.Exit(code)`
`133`	`133`	`}`
`134`		`- fmt.Fprintf(os.Stderr, "ERROR: unhandled pid1 error: %v\n", err)`
	`134`	`+ fmt.Fprintf(os.Stderr, "FATAL: unhandled pid1 error: %v\n", err)`
`135`	`135`	`os.Exit(127)`
`136`	`136`	`}`
`137`	`137`
`@@ -352,7 +352,7 @@ func main() {`
`352`	`352`	`}`
`353`	`353`	`var absRoot absPath`
`354`	`354`	`if abs, err := absPath(*flRoot).Canonical(); err != nil {`
`355`		`- fmt.Fprintf(os.Stderr, "ERROR: can't absolutize --root: %v\n", err)`
	`355`	`+ fmt.Fprintf(os.Stderr, "FATAL: can't absolutize --root: %v\n", err)`
`356`	`356`	`os.Exit(1)`
`357`	`357`	`} else {`
`358`	`358`	`absRoot = abs`
`@@ -370,40 +370,40 @@ func main() {`
`370`	`370`	`cmdRunner := cmd.NewRunner(log)`
`371`	`371`
`372`	`372`	`if *flRepo == "" {`
`373`		`- handleConfigError(log, true, "ERROR: --repo must be specified")`
	`373`	`+ fatalConfigError(log, true, "required flag: --repo must be specified")`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`switch {`
`377`	`377`	`case flDeprecatedBranch != "" && (flDeprecatedRev == "" \|\| *flDeprecatedRev == "HEAD"):`
`378`	`378`	`// Back-compat`
`379`	`379`	`log.V(0).Info("setting --ref from deprecated --branch")`
`380`	`380`	`flRef = flDeprecatedBranch`
`381`		`- case *flDeprecatedRev != "":`
	`381`	`+ case flDeprecatedRev != "" && flDeprecatedBranch == "":`
`382`	`382`	`// Back-compat`
`383`	`383`	`log.V(0).Info("setting --ref from deprecated --rev")`
`384`	`384`	`flRef = flDeprecatedRev`
`385`	`385`	`case flDeprecatedBranch != "" && flDeprecatedRev != "":`
`386`		`- handleConfigError(log, true, "ERROR: can't set --ref from deprecated --branch and --rev")`
	`386`	`+ fatalConfigError(log, true, "deprecated flag combo: can't set --ref from deprecated --branch and --rev (one or the other is OK)")`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`if *flRef == "" {`
`390`		`- handleConfigError(log, true, "ERROR: --ref must be specified")`
	`390`	`+ fatalConfigError(log, true, "required flag: --ref must be specified")`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`if *flDepth < 0 { // 0 means "no limit"`
`394`		`- handleConfigError(log, true, "ERROR: --depth must be greater than or equal to 0")`
	`394`	`+ fatalConfigError(log, true, "invalid flag: --depth must be greater than or equal to 0")`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`switch submodulesMode(*flSubmodules) {`
`398`	`398`	`case submodulesRecursive, submodulesShallow, submodulesOff:`
`399`	`399`	`default:`
`400`		`- handleConfigError(log, true, "ERROR: --submodules must be one of %q, %q, or %q", submodulesRecursive, submodulesShallow, submodulesOff)`
	`400`	`+ fatalConfigError(log, true, "invalid flag: --submodules must be one of %q, %q, or %q", submodulesRecursive, submodulesShallow, submodulesOff)`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`switch *flGitGC {`
`404`	`404`	`case gcAuto, gcAlways, gcAggressive, gcOff:`
`405`	`405`	`default:`
`406`		`- handleConfigError(log, true, "ERROR: --git-gc must be one of %q, %q, %q, or %q", gcAuto, gcAlways, gcAggressive, gcOff)`
	`406`	`+ fatalConfigError(log, true, "invalid flag: --git-gc must be one of %q, %q, %q, or %q", gcAuto, gcAlways, gcAggressive, gcOff)`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`if *flDeprecatedDest != "" {`
`@@ -422,11 +422,11 @@ func main() {`
`422`	`422`	`flPeriod = time.Duration(int(flDeprecatedWait1000)) time.Millisecond`
`423`	`423`	`}`
`424`	`424`	`if flPeriod < 10time.Millisecond {`
`425`		`- handleConfigError(log, true, "ERROR: --period must be at least 10ms")`
	`425`	`+ fatalConfigError(log, true, "invalid flag: --period must be at least 10ms")`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`if *flDeprecatedChmod != 0 {`
`429`		`- handleConfigError(log, true, "ERROR: --change-permissions is no longer supported")`
	`429`	`+ fatalConfigError(log, true, "deprecated flag: --change-permissions is no longer supported")`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`var syncSig syscall.Signal`
`@@ -443,7 +443,7 @@ func main() {`
`443`	`443`	`}`
`444`	`444`	`}`
`445`	`445`	`if syncSig == 0 {`
`446`		`- handleConfigError(log, true, "ERROR: --sync-on-signal must be a valid signal name or number")`
	`446`	`+ fatalConfigError(log, true, "invalid flag: --sync-on-signal must be a valid signal name or number")`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`
`@@ -453,7 +453,7 @@ func main() {`
`453`	`453`	`flSyncTimeout = time.Duration(flDeprecatedTimeout) * time.Second`
`454`	`454`	`}`
`455`	`455`	`if flSyncTimeout < 10time.Millisecond {`
`456`		`- handleConfigError(log, true, "ERROR: --sync-timeout must be at least 10ms")`
	`456`	`+ fatalConfigError(log, true, "invalid flag: --sync-timeout must be at least 10ms")`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`if *flDeprecatedMaxSyncFailures != 0 {`
`@@ -469,10 +469,10 @@ func main() {`
`469`	`469`	`}`
`470`	`470`	`if *flExechookCommand != "" {`
`471`	`471`	`if *flExechookTimeout < time.Second {`
`472`		`- handleConfigError(log, true, "ERROR: --exechook-timeout must be at least 1s")`
	`472`	`+ fatalConfigError(log, true, "invalid flag: --exechook-timeout must be at least 1s")`
`473`	`473`	`}`
`474`	`474`	`if *flExechookBackoff < time.Second {`
`475`		`- handleConfigError(log, true, "ERROR: --exechook-backoff must be at least 1s")`
	`475`	`+ fatalConfigError(log, true, "invalid flag: --exechook-backoff must be at least 1s")`
`476`	`476`	`}`
`477`	`477`	`}`
`478`	`478`
`@@ -482,60 +482,60 @@ func main() {`
`482`	`482`	`*flWebhookStatusSuccess = 0`
`483`	`483`	`}`
`484`	`484`	`if *flWebhookStatusSuccess < 0 {`
`485`		`- handleConfigError(log, true, "ERROR: --webhook-success-status must be a valid HTTP code or 0")`
	`485`	`+ fatalConfigError(log, true, "invalid flag: --webhook-success-status must be a valid HTTP code or 0")`
`486`	`486`	`}`
`487`	`487`	`if *flWebhookTimeout < time.Second {`
`488`		`- handleConfigError(log, true, "ERROR: --webhook-timeout must be at least 1s")`
	`488`	`+ fatalConfigError(log, true, "invalid flag: --webhook-timeout must be at least 1s")`
`489`	`489`	`}`
`490`	`490`	`if *flWebhookBackoff < time.Second {`
`491`		`- handleConfigError(log, true, "ERROR: --webhook-backoff must be at least 1s")`
	`491`	`+ fatalConfigError(log, true, "invalid flag: --webhook-backoff must be at least 1s")`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`if *flUsername != "" {`
`496`	`496`	`if flPassword == "" && flPasswordFile == "" {`
`497`		`- handleConfigError(log, true, "ERROR: --password or --password-file must be specified when --username is specified")`
	`497`	`+ fatalConfigError(log, true, "required flag: --password or --password-file must be specified when --username is specified")`
`498`	`498`	`}`
`499`	`499`	`if flPassword != "" && flPasswordFile != "" {`
`500`		`- handleConfigError(log, true, "ERROR: only one of --password and --password-file may be specified")`
	`500`	`+ fatalConfigError(log, true, "invalid flag: only one of --password and --password-file may be specified")`
`501`	`501`	`}`
`502`	`502`	`if u, err := url.Parse(*flRepo); err == nil { // it may not even parse as a URL, that's OK`
`503`	`503`	`if u.User != nil {`
`504`		`- handleConfigError(log, true, "ERROR: credentials may not be specified in --repo when --username is specified")`
	`504`	`+ fatalConfigError(log, true, "invalid flag: credentials may not be specified in --repo when --username is specified")`
`505`	`505`	`}`
`506`	`506`	`}`
`507`	`507`	`} else {`
`508`	`508`	`if *flPassword != "" {`
`509`		`- handleConfigError(log, true, "ERROR: --password may only be specified when --username is specified")`
	`509`	`+ fatalConfigError(log, true, "invalid flag: --password may only be specified when --username is specified")`
`510`	`510`	`}`
`511`	`511`	`if *flPasswordFile != "" {`
`512`		`- handleConfigError(log, true, "ERROR: --password-file may only be specified when --username is specified")`
	`512`	`+ fatalConfigError(log, true, "invalid flag: --password-file may only be specified when --username is specified")`
`513`	`513`	`}`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`if len(*flCredentials) > 0 {`
`517`	`517`	`for _, cred := range *flCredentials {`
`518`	`518`	`if cred.URL == "" {`
`519`		`- handleConfigError(log, true, "ERROR: --credential URL must be specified")`
	`519`	`+ fatalConfigError(log, true, "invalid flag: --credential URL must be specified")`
`520`	`520`	`}`
`521`	`521`	`if cred.Username == "" {`
`522`		`- handleConfigError(log, true, "ERROR: --credential username must be specified")`
	`522`	`+ fatalConfigError(log, true, "invalid flag: --credential username must be specified")`
`523`	`523`	`}`
`524`	`524`	`if cred.Password == "" && cred.PasswordFile == "" {`
`525`		`- handleConfigError(log, true, "ERROR: --credential password or password-file must be set")`
	`525`	`+ fatalConfigError(log, true, "invalid flag: --credential password or password-file must be specified")`
`526`	`526`	`}`
`527`	`527`	`if cred.Password != "" && cred.PasswordFile != "" {`
`528`		`- handleConfigError(log, true, "ERROR: only one of --credential password and password-file may be specified")`
	`528`	`+ fatalConfigError(log, true, "invalid flag: only one of --credential password and password-file may be specified")`
`529`	`529`	`}`
`530`	`530`	`}`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`if *flHTTPBind == "" {`
`534`	`534`	`if *flHTTPMetrics {`
`535`		`- handleConfigError(log, true, "ERROR: --http-bind must be specified when --http-metrics is set")`
	`535`	`+ fatalConfigError(log, true, "required flag: --http-bind must be specified when --http-metrics is set")`
`536`	`536`	`}`
`537`	`537`	`if *flHTTPprof {`
`538`		`- handleConfigError(log, true, "ERROR: --http-bind must be specified when --http-pprof is set")`
	`538`	`+ fatalConfigError(log, true, "required flag: --http-bind must be specified when --http-pprof is set")`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`
`@@ -552,7 +552,7 @@ func main() {`
`552`	`552`	`"flags", logSafeFlags(*flVerbose))`
`553`	`553`
`554`	`554`	`if _, err := exec.LookPath(*flGitCmd); err != nil {`
`555`		`- log.Error(err, "ERROR: git executable not found", "git", *flGitCmd)`
	`555`	`+ log.Error(err, "FATAL: git executable not found", "git", *flGitCmd)`
`556`	`556`	`os.Exit(1)`
`557`	`557`	`}`
`558`	`558`
`@@ -568,13 +568,13 @@ func main() {`
`568`	`568`	`// very early so that we can normalize the path even when there are`
`569`	`569`	`// symlinks in play.`
`570`	`570`	`if err := os.MkdirAll(absRoot.String(), defaultDirMode); err != nil {`
`571`		`- log.Error(err, "ERROR: can't make root dir", "path", absRoot)`
	`571`	`+ log.Error(err, "FATAL: can't make root dir", "path", absRoot)`
`572`	`572`	`os.Exit(1)`
`573`	`573`	`}`
`574`	`574`	`// Get rid of symlinks in the root path to avoid getting confused about`
`575`	`575`	`// them later. The path must exist for EvalSymlinks to work.`
`576`	`576`	`if delinked, err := filepath.EvalSymlinks(absRoot.String()); err != nil {`
`577`		`- log.Error(err, "ERROR: can't normalize root path", "path", absRoot)`
	`577`	`+ log.Error(err, "FATAL: can't normalize root path", "path", absRoot)`
`578`	`578`	`os.Exit(1)`
`579`	`579`	`} else {`
`580`	`580`	`absRoot = absPath(delinked)`
`@@ -617,7 +617,7 @@ func main() {`
`617`	`617`
`618`	`618`	`if *flAddUser {`
`619`	`619`	`if err := addUser(); err != nil {`
`620`		`- log.Error(err, "ERROR: can't add user")`
	`620`	`+ log.Error(err, "FATAL: can't add user")`
`621`	`621`	`os.Exit(1)`
`622`	`622`	`}`
`623`	`623`	`}`
`@@ -653,7 +653,7 @@ func main() {`
`653`	`653`
`654`	`654`	`// Don't pollute the user's .gitconfig if this is being run directly.`
`655`	`655`	`if f, err := os.CreateTemp("", "git-sync.gitconfig.*"); err != nil {`
`656`		`- log.Error(err, "ERROR: can't create gitconfig file")`
	`656`	`+ log.Error(err, "FATAL: can't create gitconfig file")`
`657`	`657`	`os.Exit(1)`
`658`	`658`	`} else {`
`659`	`659`	`gitConfig := f.Name()`
`@@ -1062,10 +1062,10 @@ func sleepForever() {`
`1062`	`1062`	`os.Exit(0)`
`1063`	`1063`	`}`
`1064`	`1064`
`1065`		`-// handleConfigError prints the error to the standard error, prints the usage`
	`1065`	`+// fatalConfigError prints the error to the standard error, prints the usage`
`1066`	`1066`	// if the `printUsage` flag is true, exports the error to the error file and
`1067`	`1067`	`// exits the process with the exit code.`
`1068`		`-func handleConfigError(log *logging.Logger, printUsage bool, format string, a ...interface{}) {`
	`1068`	`+func fatalConfigError(log *logging.Logger, printUsage bool, format string, a ...interface{}) {`
`1069`	`1069`	`s := fmt.Sprintf(format, a...)`
`1070`	`1070`	`fmt.Fprintln(os.Stderr, s)`
`1071`	`1071`	`if printUsage {`