summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-07-14 14:45:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-27 22:35:06 (GMT)
commitc44a4c650c66eb7b8d50c57fd4e1bff1add7bf77 (patch)
tree117981093dba638b85433c00c123d48bd2085f06 /t
parentb174ae7df2aa196beefca605f2df778ad15b6ad7 (diff)
downloadgit-c44a4c650c66eb7b8d50c57fd4e1bff1add7bf77.zip
git-c44a4c650c66eb7b8d50c57fd4e1bff1add7bf77.tar.gz
git-c44a4c650c66eb7b8d50c57fd4e1bff1add7bf77.tar.bz2
rebase -i: rearrange fixup/squash lines using the rebase--helper
This operation has quadratic complexity, which is especially painful on Windows, where shell scripts are *already* slow (mainly due to the overhead of the POSIX emulation layer). Let's reimplement this with linear complexity (using a hash map to match the commits' subject lines) for the common case; Sadly, the fixup/squash feature's design neglected performance considerations, allowing arbitrary prefixes (read: `fixup! hell` will match the commit subject `hello world`), which means that we are stuck with quadratic performance in the worst case. The reimplemented logic also happens to fix a bug where commented-out lines (representing empty patches) were dropped by the previous code. While at it, clarify how the fixup/squash feature works in `git rebase -i`'s man page. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3415-rebase-autosquash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 62cb977..e364c12 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -290,7 +290,7 @@ set_backup_editor () {
test_set_editor "$PWD/backup-editor.sh"
}
-test_expect_failure 'autosquash with multiple empty patches' '
+test_expect_success 'autosquash with multiple empty patches' '
test_tick &&
git commit --allow-empty -m "empty" &&
test_tick &&