Show repo trust prompt only if interactive ⚓

gabyx · Mar 17, 2021 · fb904fc · fb904fc
1 parent 55076eb
commit fb904fc
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/githooks/apps/runner/runner.go b/githooks/apps/runner/runner.go
@@ -139,15 +139,15 @@ func setMainVariables(repoPath string) (HookSettings, UISettings) {
 	promptCtx, err := prompt.CreateContext(log, true, false)
 	log.DebugIfF(err != nil, "Prompt setup failed -> using fallback.")
 
-	isTrusted, hasTrustFile := hooks.IsRepoTrusted(gitx, repoPath)
-	if !isTrusted && hasTrustFile {
-		isTrusted = showTrustRepoPrompt(gitx, promptCtx)
-	}
-
 	nonInteractive := hooks.IsRunnerNonInteractive(gitx, git.Traverse)
 	skipNonExistingSharedHooks, _ := hooks.SkipNonExistingSharedHooks(gitx, git.Traverse)
 	skipUntrustedHooks, _ := hooks.SkipUntrustedHooks(gitx, git.Traverse)
 
+	isTrusted, hasTrustFile := hooks.IsRepoTrusted(gitx, repoPath)
+	if !isTrusted && hasTrustFile && !nonInteractive {
+		isTrusted = showTrustRepoPrompt(gitx, promptCtx)
+	}
+
 	s := HookSettings{
 		Args:               os.Args[2:],
 		ExecX:              execx,
@@ -239,7 +239,7 @@ func showTrustRepoPrompt(gitx *git.Context, promptCtx prompt.IContext) (isTruste
 		return
 	}
 
-	if answer == "y" || answer == "Y" {
+	if answer == "y" {
 		err := hooks.SetTrustAllSetting(gitx, true, false)
 		log.AssertNoErrorF(err, "Could not store trust setting.")
 		isTrusted = true