diff --git a/.github/workflows/cygwin-test.yml b/.github/workflows/cygwin-test.yml index d190f1132..89c03a394 100644 --- a/.github/workflows/cygwin-test.yml +++ b/.github/workflows/cygwin-test.yml @@ -26,7 +26,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - submodules: recursive - name: Install Cygwin uses: cygwin/cygwin-install-action@v4 diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 2a82e0e03..2dd97183b 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -27,7 +27,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - submodules: recursive - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/VERSION b/VERSION index 3fef00337..efb1eb44f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.38 +3.1.40 diff --git a/doc/source/changes.rst b/doc/source/changes.rst index 431ad03e2..71f0bd74c 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -2,6 +2,12 @@ Changelog ========= +3.1.40 +====== + +See the following for all changes. +https://github.com/gitpython-developers/GitPython/releases/tag/3.1.40 + 3.1.38 ====== diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index 13d897263..473ebde76 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -948,17 +948,16 @@ def remove( """Remove this submodule from the repository. This will remove our entry from the .gitmodules file and the entry in the .git / config file. - :param module: If True, the module checkout we point to will be deleted - as well. If the module is currently on a commit which is not part - of any branch in the remote, if the currently checked out branch - working tree, or untracked files, - is ahead of its tracking branch, if you have modifications in the + :param module: If True, the checked out module we point to will be deleted as + well.If that module is currently on a commit outside any branch in the + remote, or if it is ahead of its tracking branch, or if there are modified + or untracked files in its working tree, then the removal will fail. In case the removal of the repository fails for these reasons, the submodule status will not have been altered. - If this submodule has child - modules on its own, these will be deleted - prior to touching the own module. + If this submodule has child modules of its own, these will be deleted prior + to touching the direct submodule. :param force: Enforces the deletion of the module even though it contains - modifications. This basically enforces a brute - force file system based + modifications. This basically enforces a brute-force file system based deletion. :param configuration: if True, the submodule is deleted from the configuration, otherwise it isn't. Although this should be enabled most of the times, diff --git a/init-tests-after-clone.sh b/init-tests-after-clone.sh index 21d1f86d8..118e1de22 100755 --- a/init-tests-after-clone.sh +++ b/init-tests-after-clone.sh @@ -47,10 +47,8 @@ git reset --hard HEAD~1 # Point the master branch where we started, so we test the correct code. git reset --hard __testing_point__ -# The tests need submodules. (On CI, they would already have been checked out.) -if ! ci; then - git submodule update --init --recursive -fi +# The tests need submodules, including a submodule with a submodule. +git submodule update --init --recursive # The tests need some version tags. Try to get them even in forks. This fetches # other objects too. So, locally, we always do it, for a consistent experience. pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy