Merge pull request kubernetes-csi#243 from pohly/git-subtree-pull-fix

pull-test.sh: avoid "git subtree pull" error
xing-yang · Nov 22, 2023 · adfddcc · adfddcc
2 parents f9d5b9c + c465088
commit adfddcc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pull-test.sh b/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