undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refresh_index: remove unnecessary calls to preload_index()

Browse Source 
With refresh_index() learning to utilize preload_index() to speed up its
operation there is no longer any benefit to having the caller preload the
index first. Remove those unneeded calls by calling read_index() instead of
the preload variant.

There is no measurable performance impact of this patch - the 2nd call to
preload_index() bails out quickly but there is no reason to call it twice.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ben Peart 2018-11-05 14:27:51 -05:00 committed by Junio C Hamano
parent 99ce720c33
commit 6c5b7f55a8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -1363,7 +1363,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
if (status_format != STATUS_FORMAT_PORCELAIN && if (status_format != STATUS_FORMAT_PORCELAIN &&
status_format != STATUS_FORMAT_PORCELAIN_V2) status_format != STATUS_FORMAT_PORCELAIN_V2)
progress_flag = REFRESH_PROGRESS; progress_flag = REFRESH_PROGRESS;
read_index_preload(&the_index, &s.pathspec, progress_flag); read_index(&the_index);
refresh_index(&the_index, refresh_index(&the_index,
REFRESH_QUIET|REFRESH_UNMERGED|progress_flag, REFRESH_QUIET|REFRESH_UNMERGED|progress_flag,
&s.pathspec, NULL, NULL); &s.pathspec, NULL, NULL);

2
builtin/describe.c
View File

@ -629,7 +629,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
struct argv_array args = ARGV_ARRAY_INIT; struct argv_array args = ARGV_ARRAY_INIT;
int fd, result; int fd, result;
read_cache_preload(NULL); read_cache();
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
NULL, NULL, NULL); NULL, NULL, NULL);
fd = hold_locked_index(&index_lock, 0); fd = hold_locked_index(&index_lock, 0);

2
builtin/update-index.c
View File

@ -782,7 +782,7 @@ struct refresh_params {
static int refresh(struct refresh_params *o, unsigned int flag) static int refresh(struct refresh_params *o, unsigned int flag)
{ {
setup_work_tree(); setup_work_tree();
read_cache_preload(NULL); read_cache();
*o->has_errors |= refresh_cache(o->flags | flag); *o->has_errors |= refresh_cache(o->flags | flag);
return 0; return 0;
} }

2
sequencer.c
View File

@ -1913,7 +1913,7 @@ static int read_and_refresh_cache(struct replay_opts *opts)
{ {
struct lock_file index_lock = LOCK_INIT; struct lock_file index_lock = LOCK_INIT;
int index_fd = hold_locked_index(&index_lock, 0); int index_fd = hold_locked_index(&index_lock, 0);
if (read_index_preload(&the_index, NULL, 0) < 0) { if (read_index(&the_index) < 0) {
rollback_lock_file(&index_lock); rollback_lock_file(&index_lock);
return error(_("git %s: failed to read the index"), return error(_("git %s: failed to read the index"),
_(action_name(opts))); _(action_name(opts)));