pull-test.sh: avoid "git subtree pull" error

kubernetes-csi / csi-release-tools

shared build and test files used by kubernetes-csi projects

Apache License 2.0

21 stars 71 forks source link

pull-test.sh: avoid "git subtree pull" error #243

Closed pohly closed 7 months ago

pohly commented 7 months ago

Without a prior git reset --hard, git subtree pull fails with:

fatal: working tree has modifications.  Cannot add.

Debugging with -d doesn't show any explanation and neither git diff nor git diff-index show any modifications. The git reset --hard shouldn't be necessary.

k8s-ci-robot commented 7 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pohly

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubernetes-csi/csi-release-tools/blob/master/OWNERS)~~ [pohly] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

pohly commented 7 months ago

/release-note-none

jsafrane commented 7 months ago

/lgtm thanks a lot for debugging this!

xing-yang commented 7 months ago

Thanks @pohly !