summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-07-07 17:52:54 +0200
committerJunio C Hamano <gitster@pobox.com>2016-07-07 15:40:23 -0700
commitc94e963b537be0371d4616ec4806b01b477feae0 (patch)
tree56f4a0bdd04307e4e9687b9271f25b88d0d54c4b /git-difftool--helper.sh
parent6672b9f962e4f01cae3c115ed54586a6f62aced3 (diff)
downloadgit-c94e963b537be0371d4616ec4806b01b477feae0.tar.gz
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>
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions