Git fork

perf: run "rebase -i" under perf

This developer spent a lot of time trying to speed up the interactive
rebase, in particular on Windows. And will continue to do so.

To make it easier to demonstrate the performance improvement, let's have
a reproducible performance test.

The topic branch we use to test performance was found using these shell
commands (essentially searching for a long-enough topic branch in Git's
own history that touched the same file multiple times):

git rev-list --parents origin/master |
grep ' .* ' |
while read commit rest
do
patch_count=$(git rev-list --count $commit^..$commit^2)
test $patch_count -gt 20 || continue

merges="$(git rev-list --parents $commit^..$commit^2 |
grep ' .* ')"
test -z "$merges" || continue

patches_per_file="$(git log --pretty=%H --name-only \
$commit^..$commit^2 |
grep -v '^$' |
sort |
uniq -c -d |
sort -n -r)"
test -n "$patches_per_file" &&
test 20 -lt $(echo "$patches_per_file" |
sed -n '1s/^ *\([0-9]*\).*/\1/p') || continue

printf 'commit %s\n%s\n' "$commit" "$patches_per_file"
done

Note that we can get away with *not* having to reset to the original
branch tip before rebasing: we switch the first two "pick" lines every
time, so we end up with the same patch order after two rebases, and the
complexity of both rebases is equivalent.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Johannes Schindelin and committed by
Junio C Hamano
e4cfe74c 7501b592

+36
+36
t/perf/p3404-rebase-interactive.sh
··· 1 + #!/bin/sh 2 + 3 + test_description='Tests rebase -i performance' 4 + . ./perf-lib.sh 5 + 6 + test_perf_default_repo 7 + 8 + # This commit merges a sufficiently long topic branch for reasonable 9 + # performance testing 10 + branch_merge=ba5312da19c6fdb6c6747d479f58932aae6e900c^{commit} 11 + export branch_merge 12 + 13 + git rev-parse --verify $branch_merge >/dev/null 2>&1 || { 14 + skip_all='skipping because $branch_merge was not found' 15 + test_done 16 + } 17 + 18 + write_script swap-first-two.sh <<\EOF 19 + case "$1" in 20 + */COMMIT_EDITMSG) 21 + mv "$1" "$1".bak && 22 + sed -e '1{h;d}' -e 2G <"$1".bak >"$1" 23 + ;; 24 + esac 25 + EOF 26 + 27 + test_expect_success 'setup' ' 28 + git config core.editor "\"$PWD"/swap-first-two.sh\" && 29 + git checkout -f $branch_merge^2 30 + ' 31 + 32 + test_perf 'rebase -i' ' 33 + git rebase -i $branch_merge^ 34 + ' 35 + 36 + test_done