diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-09 14:06:25 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-09 14:06:25 -0800 |
commit | bf69da56c9e8adac1eee91b7a8b000363156c583 (patch) | |
tree | 52bb09ed0e03e9d5a415ef5b71c9cc4031acf14f /t/perf/p3400-rebase.sh | |
parent | Merge branch 'as/tests-cleanup' (diff) | |
parent | p7519-fsmonitor: add a git add benchmark (diff) | |
download | tgif-bf69da56c9e8adac1eee91b7a8b000363156c583.tar.xz |
Merge branch 'nk/diff-files-vs-fsmonitor'
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
* nk/diff-files-vs-fsmonitor:
p7519-fsmonitor: add a git add benchmark
p7519-fsmonitor: refactor to avoid code duplication
perf lint: add make test-lint to perf tests
t/perf: add fsmonitor perf test for git diff
t/perf/p7519-fsmonitor.sh: warm cache on first git status
t/perf/README: elaborate on output format
fsmonitor: use fsmonitor data in `git diff`
Diffstat (limited to 't/perf/p3400-rebase.sh')
-rwxr-xr-x | t/perf/p3400-rebase.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh index d202aaed06..7a0bb29448 100755 --- a/t/perf/p3400-rebase.sh +++ b/t/perf/p3400-rebase.sh @@ -9,16 +9,16 @@ 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 $(seq 100) + for i in $(test_seq 100) do # simulate huge diffs echo change$i >unrelated-file$i && - seq 1000 >>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 && - seq 1000 | tac >>unrelated-file$i && + test_seq 1000 | tac >>unrelated-file$i && git add unrelated-file$i && test_tick && git commit -m commit$i-reverse unrelated-file$i || |