mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
6df5762db3
git diff --no-index ... currently reads the index, during setup, when calling gitmodules_config(). This results in worse performance when the index is not actually needed. This patch avoids calling gitmodules_config() when the --no-index option is given. The times for executing "git diff --no-index" in the WebKit repository are improved as follows: Test HEAD~3 HEAD ------------------------------------------------------------------ 4001.1: diff --no-index 0.24(0.15+0.09) 0.01(0.00+0.00) -95.8% An additional improvement of this patch is that "git diff --no-index" no longer breaks when the index file is corrupt, which makes it possible to use it for investigating the broken repository. To improve the possible usage as investigation tool for broken repositories, setup_git_directory_gently() is also not called when the --no-index option is given. Also add a test to guard against future breakages, and a performance test to show the improvements. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
22 lines
404 B
Bash
Executable file
22 lines
404 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description="Test diff --no-index performance"
|
|
|
|
. ./perf-lib.sh
|
|
|
|
test_perf_large_repo
|
|
test_checkout_worktree
|
|
|
|
file1=$(git ls-files | tail -n 2 | head -1)
|
|
file2=$(git ls-files | tail -n 1 | head -1)
|
|
|
|
test_expect_success "empty files, so they take no time to diff" "
|
|
echo >$file1 &&
|
|
echo >$file2
|
|
"
|
|
|
|
test_perf "diff --no-index" "
|
|
git diff --no-index $file1 $file2 >/dev/null
|
|
"
|
|
|
|
test_done
|