Merge pull request #2561 from jaypipes/go-mod-cleanup

Use git reset instead of git restore
kubernetes · Nov 27, 2019 · 0ae9d83 · 0ae9d83
2 parents 4ae00de + 237863a
commit 0ae9d83
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster-autoscaler/hack/update-vendor.sh b/cluster-autoscaler/hack/update-vendor.sh
@@ -185,7 +185,7 @@ set +o errexit
   fi
 
   # Commit go.mod* and vendor
-  git restore --staged . >&${BASH_XTRACEFD} 2>&1
+  git reset . >&${BASH_XTRACEFD} 2>&1
   git add vendor go.mod go.sum >&${BASH_XTRACEFD} 2>&1
   if ! git diff --quiet --cached; then
     echo "Commiting vendor, go.mod and go.sum"