diff options
| author | Thomas Gummerer <t.gummerer@gmail.com> | 2013-12-11 10:58:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 21:23:02 +0100 |
| commit | 6df5762db354ca55a0cf77451d06b332b7de0b82 (patch) | |
| tree | 5f64e40da39f8969e1a34f04a993cbe0a453ec62 /t/t4053-diff-no-index.sh | |
| parent | diff: move no-index detection to builtin/diff.c (diff) | |
| download | git-6df5762db354ca55a0cf77451d06b332b7de0b82.tar.xz git-6df5762db354ca55a0cf77451d06b332b7de0b82.zip | |
diff: don't read index when --no-index is given
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>
Diffstat (limited to 't/t4053-diff-no-index.sh')
| -rwxr-xr-x | t/t4053-diff-no-index.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh index 979e98398b..077c775e77 100755 --- a/t/t4053-diff-no-index.sh +++ b/t/t4053-diff-no-index.sh @@ -29,4 +29,19 @@ test_expect_success 'git diff --no-index relative path outside repo' ' ) ' +test_expect_success 'git diff --no-index with broken index' ' + ( + cd repo && + echo broken >.git/index && + git diff --no-index a ../non/git/a + ) +' + +test_expect_success 'git diff outside repo with broken index' ' + ( + cd repo && + git diff ../non/git/a ../non/git/b + ) +' + test_done |