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 12:23:02 -0800 |
| commit | 6df5762db354ca55a0cf77451d06b332b7de0b82 (patch) | |
| tree | 5f64e40da39f8969e1a34f04a993cbe0a453ec62 /t/perf | |
| parent | diff: move no-index detection to builtin/diff.c (diff) | |
| download | tgif-6df5762db354ca55a0cf77451d06b332b7de0b82.tar.xz | |
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/perf')
| -rwxr-xr-x | t/perf/p4001-diff-no-index.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/perf/p4001-diff-no-index.sh b/t/perf/p4001-diff-no-index.sh new file mode 100755 index 0000000000..683be6984f --- /dev/null +++ b/t/perf/p4001-diff-no-index.sh @@ -0,0 +1,22 @@ +#!/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 |