Merge pull request #11050 from dawei-sdw:dw_modify_patch_path

PiperOrigin-RevId: 688320641
google · Oct 21, 2024 · 9ea896e · 9ea896e
2 parents 0f30a4a + 9aa5777
commit 9ea896e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -97,7 +97,7 @@ go_download_sdk(
     # analysis. Without this fix, the nogo rules will often fail to run in
     # time on our continuous integration.
     patch = "//tools:go_types_memoize.patch",
-    patch_strip = 2,
+    patch_strip = 1,
     version = "1.23.2",
 )
 

diff --git a/tools/go_types_memoize.patch b/tools/go_types_memoize.patch
@@ -1,7 +1,7 @@
-diff --git a/go/src/go/types/scope.go b/src/go/types/scope.go
+diff --git a/src/go/types/scope.go b/src/go/types/scope.go
 index 010727eb72..0f134b872e 100644
---- a/go/src/go/types/scope.go
-+++ b/go/src/go/types/scope.go
+--- a/src/go/types/scope.go
++++ b/src/go/types/scope.go
 @@ -25,6 +25,7 @@ type Scope struct {
  	children []*Scope
  	number   int               // parent.children[number-1] is this scope; 0 if there is no parent