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

Do not create nested commit for root module
googleapis · Nov 3, 2023 · b5f205c · b5f205c
1 parent df95f3a
commit b5f205c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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")