Do not count changed submodules as needed to stash

This commit is contained in:
Mikhail f. Shiryaev 2023-02-03 23:17:06 +01:00
parent a4c2ac7e97
commit 0e10593037
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4

View File

@ -467,7 +467,8 @@ def clear_repo():
@contextmanager
def stash():
need_stash = bool(git_runner("git diff HEAD"))
# diff.ignoreSubmodules=all don't show changed submodules
need_stash = bool(git_runner("git -c diff.ignoreSubmodules=all diff HEAD"))
if need_stash:
git_runner("git stash push --no-keep-index -m 'running cherry_pick.py'")
try: