diff options
| author | Jeremy Stanley <fungi@yuggoth.org> | 2021-07-07 15:54:29 +0000 |
|---|---|---|
| committer | Jeremy Stanley <fungi@yuggoth.org> | 2021-07-07 16:08:06 +0000 |
| commit | 6c3f134ac37969560f56e8c8f44e845d82fcf130 (patch) | |
| tree | 89a87f2c118e78daf34595e20c8d43b667aeccfd /releasenotes | |
| parent | 04786cd9ea619203589cf8bed231e04059add266 (diff) | |
| download | git-review-6c3f134ac37969560f56e8c8f44e845d82fcf130.tar.gz | |
Ignore unstaged/uncommitted submodule changes
When checking for unstaged or uncommitted changes to avoid the test
rebase (which could cause data loss for users of git.autostash),
it's still fine if there are unstaged or uncommitted changes in
submodules since those won't be rebased. Have the git diff
invocations explicitly ignore submodules, and also add regression
tests which demonstrate it's working.
This fixes a regression originally introduced by change
Iabb8387c9db59a7d02ebfd43b688e7bb93d3159f.
Change-Id: I20d602e86537b573ac1f9788221215047a594f83
Diffstat (limited to 'releasenotes')
| -rw-r--r-- | releasenotes/notes/ignore-unstaged-uncommitted-submodule-changes-99dbf054f5617d08.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/releasenotes/notes/ignore-unstaged-uncommitted-submodule-changes-99dbf054f5617d08.yaml b/releasenotes/notes/ignore-unstaged-uncommitted-submodule-changes-99dbf054f5617d08.yaml new file mode 100644 index 0000000..0523b3a --- /dev/null +++ b/releasenotes/notes/ignore-unstaged-uncommitted-submodule-changes-99dbf054f5617d08.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + When checking for unstaged or uncommitted changes to avoid performing a + test rebase, unstaged and uncommitted changes in Git submodules are now + ignored since those won't be rebased anyway. |