You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
Copy file name to clipboardExpand all lines: pull-test.sh
+1
Original file line number
Diff line number
Diff line change
@@ -25,6 +25,7 @@ CSI_RELEASE_TOOLS_DIR="$(pwd)"
25
25
26
26
# Update the other repo.
27
27
cd"$PULL_TEST_REPO_DIR"
28
+
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)
0 commit comments