diff options
| author | Jeremy Stanley <fungi@yuggoth.org> | 2021-02-24 20:24:02 +0000 |
|---|---|---|
| committer | Jeremy Stanley <fungi@yuggoth.org> | 2021-02-26 16:20:49 +0000 |
| commit | d83d99cadc4405f89bfb3f9ca35861001d26e0d7 (patch) | |
| tree | 490e300ce8bde0ef0bfbde0ad85b920535b6d51a /releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml | |
| parent | e8d54043203fd80a28a437684fed8ab3b24a3b21 (diff) | |
| download | git-review-d83d99cadc4405f89bfb3f9ca35861001d26e0d7.tar.gz | |
Don't test rebasing with unstaged changes
For safety, attempts to push a commit with unstaged or uncommitted
changes in the worktree will be caught and an error reported, rather
than leaving it up to ``git rebase`` to spot them. This addresses a
situation where users enabling "rebase.autostash" would otherwise
experience data loss when the test rebase is subsequently reset.
Change-Id: Iabb8387c9db59a7d02ebfd43b688e7bb93d3159f
Task: #38921
Diffstat (limited to 'releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml')
| -rw-r--r-- | releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml b/releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml new file mode 100644 index 0000000..8e19e81 --- /dev/null +++ b/releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + For safety, attempts to push a commit with unstaged or uncommitted changes + in the worktree will be caught and an error reported, rather than leaving + it up to ``git rebase`` to spot them. This addresses a situation where + users enabling *rebase.autostash* would otherwise experience data loss when + the test rebase is subsequently reset. |