alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squashed 'release-tools/' changes from f9d5b9c0..f8c8cc4c

Browse Source 
f8c8cc4c Merge pull request #237 from msau42/prow
b36b5bfd Merge pull request #240 from dannawang0221/upgrade-go-version
adfddcc9 Merge pull request #243 from pohly/git-subtree-pull-fix
c4650889 pull-test.sh: avoid "git subtree pull" error
7b175a1e Update csi-test version to v5.2.0
987c90cc Update go version to 1.21 to match k/k
2c625d41 Add script to generate patch release notes

git-subtree-dir: release-tools
git-subtree-split: f8c8cc4c7414c11526f14649856ff8e6b8a4e67c
This commit is contained in:
xing-yang
2023-11-26 20:47:24 -05:00
parent 36ca7a1f5a
commit cf43916499
4 changed files with 143 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pull-test.sh
View File

@@ -25,6 +25,7 @@ CSI_RELEASE_TOOLS_DIR="$(pwd)"
# Update the other repo.
cd "$PULL_TEST_REPO_DIR"
git reset --hard # Shouldn't be necessary, but somehow is to avoid "fatal: working tree has modifications. Cannot add." (https://stackoverflow.com/questions/3623351/git-subtree-pull-says-that-the-working-tree-has-modifications-but-git-status-sa)
git subtree pull --squash --prefix=release-tools "$CSI_RELEASE_TOOLS_DIR" master
git log -n2