| commit | c94e963b537be0371d4616ec4806b01b477feae0 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Thu, 7 Jul 2016 15:52:54 +0000 (7 17:52 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jul 2016 22:40:23 +0000 (7 15:40 -0700) | ||
| tree | 56f4a0bdd04307e4e9687b9271f25b88d0d54c4b | treesnapshot (tar.gz zip) |
| parent | 6672b9f962e4f01cae3c115ed54586a6f62aced3 | commitdiff |
rebase -i: demonstrate a bug with --autosquash
When rearranging the edit script, we happily mistake the comment
character for a command, and the command for a SHA-1. As a consequence,
when we move fixup! and squash! commits, our logic to skip lines with
already handled SHA-1s mistakenly skips anything but the first
commented-out pick line, too.
The upcoming rebase--helper patches will address this bug, therefore we
do not need to make the current autosquash code even more complex than
it already is, just to fix this bug.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When rearranging the edit script, we happily mistake the comment
character for a command, and the command for a SHA-1. As a consequence,
when we move fixup! and squash! commits, our logic to skip lines with
already handled SHA-1s mistakenly skips anything but the first
commented-out pick line, too.
The upcoming rebase--helper patches will address this bug, therefore we
do not need to make the current autosquash code even more complex than
it already is, just to fix this bug.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3415-rebase-autosquash.sh | diffblobblamehistory |