File tree 5 files changed +21
-19
lines changed
5 files changed +21
-19
lines changed Original file line number Diff line number Diff line change 5
5
require (
6
6
github.com/spf13/cobra v1.7.0
7
7
gotest.tools/v3 v3.3.0
8
- knative.dev/client-pkg v0.0.0-20240808015000-22f598931483
9
- knative.dev/hack v0.0.0-20240814130635-06f7aff93954
8
+ knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822
9
+ knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
10
10
)
11
11
12
12
require (
Original file line number Diff line number Diff line change @@ -79,10 +79,10 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
79
79
k8s.io/klog/v2 v2.120.1 /go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE =
80
80
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ =
81
81
k8s.io/utils v0.0.0-20240102154912-e7106e64919e /go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0 =
82
- knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 h1:jBfmxcR0H5Z9IzamelZtmmg9jfeOXfssllUVX5M4Xzs =
83
- knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 /go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg =
84
- knative.dev/hack v0.0.0-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM =
85
- knative.dev/hack v0.0.0-20240814130635-06f7aff93954 /go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY =
82
+ knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822 h1:5SW0WZxq8X2swhjSQBciWIGkaJr9XFrddbmuQCYY8kE =
83
+ knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822 /go.mod h1:LZur1NaQ0sSun/QEZ5R2I99bS5lOW//Y68JLpUEpkJc =
84
+ knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d h1:aCfX7kwkvgGxXXGbso5tLqdwQmzBkJ9d+EIRwksKTvk =
85
+ knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d /go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY =
86
86
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE =
87
87
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 /go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw =
88
88
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo =
Original file line number Diff line number Diff line change @@ -133,16 +133,18 @@ function restore-changes-if-its-copyright-year-only() {
133
133
local difflist
134
134
log " Cleaning up generated code"
135
135
difflist=" $( mktemp) "
136
- git diff --exit-code --name-only > " $difflist "
137
- # list git changes and skip those which differ only in the boilerplate year
138
- while read -r file; do
139
- # check if the file contains just the change in the boilerplate year
140
- if [ " $( LANG=C git diff --exit-code --shortstat -- " $file " ) " = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
141
- [[ " $( git diff --exit-code -U1 -- " $file " | grep -Ec ' ^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}' ) " -eq 2 ]]; then
142
- # restore changes to that file
143
- git checkout -- " $file "
144
- fi
145
- done < " $difflist "
136
+ if ! git diff --exit-code --name-only > /dev/null; then
137
+ # list git changes and skip those which differ only in the boilerplate year
138
+ git diff --name-only > " $difflist "
139
+ while read -r file; do
140
+ # check if the file contains just the change in the boilerplate year
141
+ if [ " $( LANG=C git diff --exit-code --shortstat -- " $file " ) " = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \
142
+ [[ " $( git diff --exit-code -U1 -- " $file " | grep -Ec ' ^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}' ) " -eq 2 ]]; then
143
+ # restore changes to that file
144
+ git checkout -- " $file "
145
+ fi
146
+ done < " $difflist "
147
+ fi
146
148
rm -f " $difflist "
147
149
}
148
150
Original file line number Diff line number Diff line change @@ -774,7 +774,7 @@ function go_update_deps() {
774
774
function __clean_goworksum_if_exists() {
775
775
if [ -f " $REPO_ROOT_DIR /go.work.sum" ]; then
776
776
log.step ' Cleaning the go.work.sum file'
777
- truncate --size 0 " $REPO_ROOT_DIR /go.work.sum"
777
+ truncate -s 0 " $REPO_ROOT_DIR /go.work.sum"
778
778
fi
779
779
}
780
780
Original file line number Diff line number Diff line change @@ -25,9 +25,9 @@ gotest.tools/v3/internal/assert
25
25
gotest.tools/v3/internal/difflib
26
26
gotest.tools/v3/internal/format
27
27
gotest.tools/v3/internal/source
28
- # knative.dev/client-pkg v0.0.0-20240808015000-22f598931483
28
+ # knative.dev/client-pkg v0.0.0-20241010131738-12612b7a7822
29
29
## explicit; go 1.22
30
30
knative.dev/client-pkg/pkg/plugin
31
- # knative.dev/hack v0.0.0-20240814130635-06f7aff93954
31
+ # knative.dev/hack v0.0.0-20241010131451-05b2fb30cb4d
32
32
## explicit; go 1.21
33
33
knative.dev/hack
You can’t perform that action at this time.
0 commit comments