chore(internal/actions): fix updateall (googleapis#8750)

quartzmo · web-flow · commit f8ba0b988c11 · 2023-10-19T13:45:00.000-06:00
Do not create nested commit for root module
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,7 +5,6 @@
 
 ### Bug Fixes
 
-* **/Users/chrisdsmith/oss/google-cloud-go:** Update golang.org/x/net to v0.17.0 ([174da47](https://github.com/googleapis/google-cloud-go/commit/174da47254fefb12921bbfc65b7829a453af6f5d))
 * **all:** Update golang.org/x/net to v0.17.0 ([#8705](https://github.com/googleapis/google-cloud-go/issues/8705)) ([174da47](https://github.com/googleapis/google-cloud-go/commit/174da47254fefb12921bbfc65b7829a453af6f5d))
 * **internal/aliasgen:** Update golang.org/x/net to v0.17.0 ([174da47](https://github.com/googleapis/google-cloud-go/commit/174da47254fefb12921bbfc65b7829a453af6f5d))
 * **internal/examples/fake:** Update golang.org/x/net to v0.17.0 ([174da47](https://github.com/googleapis/google-cloud-go/commit/174da47254fefb12921bbfc65b7829a453af6f5d))
diff --git a/internal/actions/cmd/updateall/main.go b/internal/actions/cmd/updateall/main.go
@@ -135,8 +135,9 @@ func update(modDir, dep, version, rootDir string) error {
 	}
 
 	if !*quiet {
-		scope := strings.TrimPrefix(strings.TrimSpace(modDir), rootDir+"/")
-		if scope == "" || scope == "main" || strings.Contains(scope, "internal/") {
+		modDir = strings.TrimSpace(modDir)
+		scope := strings.TrimPrefix(modDir, rootDir+"/")
+		if scope == modDir || scope == "" || scope == "main" || strings.Contains(scope, "internal/") {
 			return nil
 		}
 		nestedCommits.WriteString("BEGIN_NESTED_COMMIT\n")

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,9 @@ func update(modDir, dep, version, rootDir string) error {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if !*quiet {`
`138`		`- scope := strings.TrimPrefix(strings.TrimSpace(modDir), rootDir+"/")`
`139`		`- if scope == "" \|\| scope == "main" \|\| strings.Contains(scope, "internal/") {`
	`138`	`+ modDir = strings.TrimSpace(modDir)`
	`139`	`+ scope := strings.TrimPrefix(modDir, rootDir+"/")`
	`140`	`+ if scope == modDir \|\| scope == "" \|\| scope == "main" \|\| strings.Contains(scope, "internal/") {`
`140`	`141`	`return nil`
`141`	`142`	`}`
`142`	`143`	`nestedCommits.WriteString("BEGIN_NESTED_COMMIT\n")`