Skip to content

Commit

Permalink
Strip the extra path in go_types_memoize.patch
Browse files Browse the repository at this point in the history
The go_types_memoize.patch was generated using the git diff command, with the 'go' field manually added to the path. It would be more appropriate to set the patch_strip value to 1 when applying such patches.

FUTURE_COPYBARA_INTEGRATE_REVIEW=#11050 from dawei-sdw:dw_modify_patch_path 9aa5777
PiperOrigin-RevId: 687470098
  • Loading branch information
dawei-sdw authored and gvisor-bot committed Oct 21, 2024
1 parent 0f30a4a commit 4d7ccc5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down
6 changes: 3 additions & 3 deletions tools/go_types_memoize.patch
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 4d7ccc5

Please sign in to comment.