Skip to content

t/perf/p3400: speed up setup using fast-import #2232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malon7782 wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −15
Open

t/perf/p3400: speed up setup using fast-import #2232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 38 additions & 15 deletions t/perf/p3400-rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,44 @@ test_expect_success 'setup rebasing on top of a lot of changes' '
git checkout -f -B base &&
git checkout -B to-rebase &&
git checkout -B upstream &&
for i in $(test_seq 100)
do
# simulate huge diffs
echo change$i >unrelated-file$i &&
test_seq 1000 >>unrelated-file$i &&
git add unrelated-file$i &&
test_tick &&
git commit -m commit$i unrelated-file$i &&
echo change$i >unrelated-file$i &&
test_seq 1000 | sort -nr >>unrelated-file$i &&
git add unrelated-file$i &&
test_tick &&
git commit -m commit$i-reverse unrelated-file$i ||
return 1
done &&
test_seq 1000 >content_fwd &&
sort -nr content_fwd >content_rev &&
(
for i in $(test_seq 100)
do
test_tick &&
echo "commit refs/heads/upstream" &&
echo "committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
echo "data <<EOF" &&
echo "commit$i" &&
echo "EOF" &&

if test "$i" = 1; then
echo "from refs/heads/upstream^0"
fi &&

echo "M 100644 inline unrelated-file$i" &&
echo "data <<EOF" &&
echo "change$i" &&
cat content_fwd &&
echo "EOF" &&

echo "commit refs/heads/upstream" &&
echo "committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
echo "data <<EOF" &&
echo "commit$i-reverse" &&
echo "EOF" &&
echo "M 100644 inline unrelated-file$i" &&
echo "data <<EOF" &&
echo "change$i" &&
cat content_rev &&
echo "EOF" || exit 1
done
) >fast_import_stream &&

git fast-import <fast_import_stream &&
git repack -a -d &&
git checkout -f upstream &&
git checkout to-rebase &&
test_commit our-patch interesting-file
'
Expand Down