summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2013-12-11 09:58:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-12 20:23:02 (GMT)
commit6df5762db354ca55a0cf77451d06b332b7de0b82 (patch)
tree5f64e40da39f8969e1a34f04a993cbe0a453ec62 /builtin/diff.c
parent470faf96544c1844ad775c695dfa370fe0ef3756 (diff)
downloadgit-6df5762db354ca55a0cf77451d06b332b7de0b82.zip
git-6df5762db354ca55a0cf77451d06b332b7de0b82.tar.gz
git-6df5762db354ca55a0cf77451d06b332b7de0b82.tar.bz2
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 'builtin/diff.c')
-rw-r--r--builtin/diff.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index da69e4a..ea1dd65 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -298,7 +298,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
break;
}
- prefix = setup_git_directory_gently(&nongit);
+ if (!no_index)
+ prefix = setup_git_directory_gently(&nongit);
+
/*
* Treat git diff with at least one path outside of the
* repo the same as if the command would have been executed
@@ -311,7 +313,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
!path_inside_repo(prefix, argv[i + 1]))))
no_index = DIFF_NO_INDEX_IMPLICIT;
- gitmodules_config();
+ if (!no_index)
+ gitmodules_config();
git_config(git_diff_ui_config, NULL);
init_revisions(&rev, prefix);