Remove underscores from Go code, pt 4

1 files changed, 136 insertions, 137 deletions

diff --git a/git_hooks_handle.go b/git_hooks_handle.go
index b931387..a244a84 100644
--- a/git_hooks_handle.go
+++ b/git_hooks_handle.go
@@ -144,169 +144,168 @@ func hooksHandler(conn net.Conn) {
 		case "pre-receive":
 			if packPass.directAccess {
 				return 0
-			} else {
-				allOK := true
-				for {
-					var line, oldOID, rest, newIOID, refName string
-					var found bool
-					var oldHash, newHash plumbing.Hash
-					var oldCommit, newCommit *object.Commit
-					var pushOptCount int
-
-					pushOptCount, err = strconv.Atoi(gitEnv["GIT_PUSH_OPTION_COUNT"])
-					if err != nil {
-						writeRedError(sshStderr, "Failed to parse GIT_PUSH_OPTION_COUNT: %v", err)
+			}
+			allOK := true
+			for {
+				var line, oldOID, rest, newIOID, refName string
+				var found bool
+				var oldHash, newHash plumbing.Hash
+				var oldCommit, newCommit *object.Commit
+				var pushOptCount int
+
+				pushOptCount, err = strconv.Atoi(gitEnv["GIT_PUSH_OPTION_COUNT"])
+				if err != nil {
+					writeRedError(sshStderr, "Failed to parse GIT_PUSH_OPTION_COUNT: %v", err)
+					return 1
+				}
+
+				// TODO: Allow existing users (even if they are already federated or registered) to add a federated user ID... though perhaps this should be in the normal SSH interface instead of the git push interface?
+				// Also it'd be nice to be able to combine users or whatever
+				if packPass.contribReq == "federated" && packPass.userType != "federated" && packPass.userType != "registered" {
+					if pushOptCount == 0 {
+						writeRedError(sshStderr, "This repo requires contributors to be either federated or registered users. You must supply your federated user ID as a push option. For example, git push -o fedid=sr.ht:runxiyu")
 						return 1
 					}
-
-					// TODO: Allow existing users (even if they are already federated or registered) to add a federated user ID... though perhaps this should be in the normal SSH interface instead of the git push interface?
-					// Also it'd be nice to be able to combine users or whatever
-					if packPass.contribReq == "federated" && packPass.userType != "federated" && packPass.userType != "registered" {
-						if pushOptCount == 0 {
-							writeRedError(sshStderr, "This repo requires contributors to be either federated or registered users. You must supply your federated user ID as a push option. For example, git push -o fedid=sr.ht:runxiyu")
+					for i := 0; i < pushOptCount; i++ {
+						pushOpt, ok := gitEnv[fmt.Sprintf("GIT_PUSH_OPTION_%d", i)]
+						if !ok {
+							writeRedError(sshStderr, "Failed to get push option %d", i)
 							return 1
 						}
-						for i := 0; i < pushOptCount; i++ {
-							pushOpt, ok := gitEnv[fmt.Sprintf("GIT_PUSH_OPTION_%d", i)]
-							if !ok {
-								writeRedError(sshStderr, "Failed to get push option %d", i)
+						if strings.HasPrefix(pushOpt, "fedid=") {
+							fedUserID := strings.TrimPrefix(pushOpt, "fedid=")
+							service, username, found := strings.Cut(fedUserID, ":")
+							if !found {
+								writeRedError(sshStderr, "Invalid federated user identifier %#v does not contain a colon", fedUserID)
 								return 1
 							}
-							if strings.HasPrefix(pushOpt, "fedid=") {
-								fedUserID := strings.TrimPrefix(pushOpt, "fedid=")
-								service, username, found := strings.Cut(fedUserID, ":")
-								if !found {
-									writeRedError(sshStderr, "Invalid federated user identifier %#v does not contain a colon", fedUserID)
-									return 1
-								}
-
-								ok, err := fedauth(ctx, packPass.userID, service, username, packPass.pubkey)
-								if err != nil {
-									writeRedError(sshStderr, "Failed to verify federated user identifier %#v: %v", fedUserID, err)
-									return 1
-								}
-								if !ok {
-									writeRedError(sshStderr, "Failed to verify federated user identifier %#v: you don't seem to be on the list", fedUserID)
-									return 1
-								}
-
-								break
+
+							ok, err := fedauth(ctx, packPass.userID, service, username, packPass.pubkey)
+							if err != nil {
+								writeRedError(sshStderr, "Failed to verify federated user identifier %#v: %v", fedUserID, err)
+								return 1
 							}
-							if i == pushOptCount-1 {
-								writeRedError(sshStderr, "This repo requires contributors to be either federated or registered users. You must supply your federated user ID as a push option. For example, git push -o fedid=sr.ht:runxiyu")
+							if !ok {
+								writeRedError(sshStderr, "Failed to verify federated user identifier %#v: you don't seem to be on the list", fedUserID)
 								return 1
 							}
-						}
-					}
 
-					line, err = stdin.ReadString('\n')
-					if errors.Is(err, io.EOF) {
-						break
-					} else if err != nil {
-						writeRedError(sshStderr, "Failed to read pre-receive line: %v", err)
-						return 1
-					}
-					line = line[:len(line)-1]
-
-					oldOID, rest, found = strings.Cut(line, " ")
-					if !found {
-						writeRedError(sshStderr, "Invalid pre-receive line: %v", line)
-						return 1
+							break
+						}
+						if i == pushOptCount-1 {
+							writeRedError(sshStderr, "This repo requires contributors to be either federated or registered users. You must supply your federated user ID as a push option. For example, git push -o fedid=sr.ht:runxiyu")
+							return 1
+						}
 					}
+				}
 
-					newIOID, refName, found = strings.Cut(rest, " ")
-					if !found {
-						writeRedError(sshStderr, "Invalid pre-receive line: %v", line)
-						return 1
-					}
+				line, err = stdin.ReadString('\n')
+				if errors.Is(err, io.EOF) {
+					break
+				} else if err != nil {
+					writeRedError(sshStderr, "Failed to read pre-receive line: %v", err)
+					return 1
+				}
+				line = line[:len(line)-1]
 
-					if strings.HasPrefix(refName, "refs/heads/contrib/") {
-						if allZero(oldOID) { // New branch
-							fmt.Fprintln(sshStderr, ansiec.Blue+"POK"+ansiec.Reset, refName)
-							var newMRID int
+				oldOID, rest, found = strings.Cut(line, " ")
+				if !found {
+					writeRedError(sshStderr, "Invalid pre-receive line: %v", line)
+					return 1
+				}
 
-							err = database.QueryRow(ctx,
-								"INSERT INTO merge_requests (repo_id, creator, source_ref, status) VALUES ($1, $2, $3, 'open') RETURNING id",
-								packPass.repoID, packPass.userID, strings.TrimPrefix(refName, "refs/heads/"),
-							).Scan(&newMRID)
-							if err != nil {
-								writeRedError(sshStderr, "Error creating merge request: %v", err)
-								return 1
-							}
-							fmt.Fprintln(sshStderr, ansiec.Blue+"Created merge request at", generate_http_remote_url(packPass.group_path, packPass.repo_name)+"/contrib/"+strconv.FormatUint(uint64(newMRID), 10)+"/"+ansiec.Reset)
-						} else { // Existing contrib branch
-							var existingMRUser int
-							var isAncestor bool
-
-							err = database.QueryRow(ctx,
-								"SELECT COALESCE(creator, 0) FROM merge_requests WHERE source_ref = $1 AND repo_id = $2",
-								strings.TrimPrefix(refName, "refs/heads/"), packPass.repoID,
-							).Scan(&existingMRUser)
-							if err != nil {
-								if errors.Is(err, pgx.ErrNoRows) {
-									writeRedError(sshStderr, "No existing merge request for existing contrib branch: %v", err)
-								} else {
-									writeRedError(sshStderr, "Error querying for existing merge request: %v", err)
-								}
-								return 1
-							}
-							if existingMRUser == 0 {
-								allOK = false
-								fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(branch belongs to unowned MR)")
-								continue
-							}
+				newIOID, refName, found = strings.Cut(rest, " ")
+				if !found {
+					writeRedError(sshStderr, "Invalid pre-receive line: %v", line)
+					return 1
+				}
 
-							if existingMRUser != packPass.userID {
-								allOK = false
-								fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(branch belongs another user's MR)")
-								continue
+				if strings.HasPrefix(refName, "refs/heads/contrib/") {
+					if allZero(oldOID) { // New branch
+						fmt.Fprintln(sshStderr, ansiec.Blue+"POK"+ansiec.Reset, refName)
+						var newMRID int
+
+						err = database.QueryRow(ctx,
+							"INSERT INTO merge_requests (repo_id, creator, source_ref, status) VALUES ($1, $2, $3, 'open') RETURNING id",
+							packPass.repoID, packPass.userID, strings.TrimPrefix(refName, "refs/heads/"),
+						).Scan(&newMRID)
+						if err != nil {
+							writeRedError(sshStderr, "Error creating merge request: %v", err)
+							return 1
+						}
+						fmt.Fprintln(sshStderr, ansiec.Blue+"Created merge request at", genHTTPRemoteURL(packPass.groupPath, packPass.repoName)+"/contrib/"+strconv.FormatUint(uint64(newMRID), 10)+"/"+ansiec.Reset)
+					} else { // Existing contrib branch
+						var existingMRUser int
+						var isAncestor bool
+
+						err = database.QueryRow(ctx,
+							"SELECT COALESCE(creator, 0) FROM merge_requests WHERE source_ref = $1 AND repo_id = $2",
+							strings.TrimPrefix(refName, "refs/heads/"), packPass.repoID,
+						).Scan(&existingMRUser)
+						if err != nil {
+							if errors.Is(err, pgx.ErrNoRows) {
+								writeRedError(sshStderr, "No existing merge request for existing contrib branch: %v", err)
+							} else {
+								writeRedError(sshStderr, "Error querying for existing merge request: %v", err)
 							}
+							return 1
+						}
+						if existingMRUser == 0 {
+							allOK = false
+							fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(branch belongs to unowned MR)")
+							continue
+						}
 
-							oldHash = plumbing.NewHash(oldOID)
+						if existingMRUser != packPass.userID {
+							allOK = false
+							fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(branch belongs another user's MR)")
+							continue
+						}
 
-							if oldCommit, err = packPass.repo.CommitObject(oldHash); err != nil {
-								writeRedError(sshStderr, "Daemon failed to get old commit: %v", err)
-								return 1
-							}
+						oldHash = plumbing.NewHash(oldOID)
 
-							// Potential BUG: I'm not sure if new_commit is guaranteed to be
-							// detectable as they haven't been merged into the main repo's
-							// objects yet. But it seems to work, and I don't think there's
-							// any reason for this to only work intermitently.
-							newHash = plumbing.NewHash(newIOID)
-							if newCommit, err = packPass.repo.CommitObject(newHash); err != nil {
-								writeRedError(sshStderr, "Daemon failed to get new commit: %v", err)
-								return 1
-							}
+						if oldCommit, err = packPass.repo.CommitObject(oldHash); err != nil {
+							writeRedError(sshStderr, "Daemon failed to get old commit: %v", err)
+							return 1
+						}
 
-							if isAncestor, err = oldCommit.IsAncestor(newCommit); err != nil {
-								writeRedError(sshStderr, "Daemon failed to check if old commit is ancestor: %v", err)
-								return 1
-							}
+						// Potential BUG: I'm not sure if new_commit is guaranteed to be
+						// detectable as they haven't been merged into the main repo's
+						// objects yet. But it seems to work, and I don't think there's
+						// any reason for this to only work intermitently.
+						newHash = plumbing.NewHash(newIOID)
+						if newCommit, err = packPass.repo.CommitObject(newHash); err != nil {
+							writeRedError(sshStderr, "Daemon failed to get new commit: %v", err)
+							return 1
+						}
 
-							if !isAncestor {
-								// TODO: Create MR snapshot ref instead
-								allOK = false
-								fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(force pushes are not supported yet)")
-								continue
-							}
+						if isAncestor, err = oldCommit.IsAncestor(newCommit); err != nil {
+							writeRedError(sshStderr, "Daemon failed to check if old commit is ancestor: %v", err)
+							return 1
+						}
 
-							fmt.Fprintln(sshStderr, ansiec.Blue+"POK"+ansiec.Reset, refName)
+						if !isAncestor {
+							// TODO: Create MR snapshot ref instead
+							allOK = false
+							fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(force pushes are not supported yet)")
+							continue
 						}
-					} else { // Non-contrib branch
-						allOK = false
-						fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(you cannot push to branches outside of contrib/*)")
+
+						fmt.Fprintln(sshStderr, ansiec.Blue+"POK"+ansiec.Reset, refName)
 					}
+				} else { // Non-contrib branch
+					allOK = false
+					fmt.Fprintln(sshStderr, ansiec.Red+"NAK"+ansiec.Reset, refName, "(you cannot push to branches outside of contrib/*)")
 				}
+			}
 
-				fmt.Fprintln(sshStderr)
-				if allOK {
-					fmt.Fprintln(sshStderr, "Overall "+ansiec.Green+"ACK"+ansiec.Reset+" (all checks passed)")
-					return 0
-				} else {
-					fmt.Fprintln(sshStderr, "Overall "+ansiec.Red+"NAK"+ansiec.Reset+" (one or more branches failed checks)")
-					return 1
-				}
+			fmt.Fprintln(sshStderr)
+			if allOK {
+				fmt.Fprintln(sshStderr, "Overall "+ansiec.Green+"ACK"+ansiec.Reset+" (all checks passed)")
+				return 0
+			} else {
+				fmt.Fprintln(sshStderr, "Overall "+ansiec.Red+"NAK"+ansiec.Reset+" (one or more branches failed checks)")
+				return 1
 			}
 		default:
 			fmt.Fprintln(sshStderr, ansiec.Red+"Invalid hook:", args[0]+ansiec.Reset)