diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-11-22 19:43:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-23 10:52:32 +0900 |
| commit | 2d05ef2778b99e05e6a8a40c5b8d59a3c4ab1274 (patch) | |
| tree | 763f4ea28732dc1f34ac0e7c4274ec272bbb0825 /git-gui/lib/commit.tcl | |
| parent | sequencer: run post-commit hook (diff) | |
| download | git-2d05ef2778b99e05e6a8a40c5b8d59a3c4ab1274.tar.gz git-2d05ef2778b99e05e6a8a40c5b8d59a3c4ab1274.zip | |
sequencer: fix empty commit check when amending
This fixes a regression introduced in 356ee4659b ("sequencer: try to
commit without forking 'git commit'", 2017-11-24). When amending a
commit try_to_commit() was using the wrong parent when checking if the
commit would be empty. When amending we need to check against HEAD^ not
HEAD.
t3403 may not seem like the natural home for the new tests but a further
patch series will improve the advice printed by `git commit`. That
series will mutate these tests to check that the advice includes
suggesting `rebase --skip` to skip the fixup that would empty the
commit.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions
