Merge commit 'cf439164991d224aa2e6f3ed1bcf931cd2cb1fdb' into update_release-tools_1123

2023-11-26 20:47:25 -05:00
parent c68695b6d1 cf43916499
commit be28c6ea64
4 changed files with 143 additions and 45 deletions
--- a/release-tools/pull-test.sh
+++ b/release-tools/pull-test.sh
@@ -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