virtualfilesystem: don't run the virtual file system hook if the index has been redirected

Fixes #13

Some git commands spawn helpers and redirect the index to a different
location.  These include "difftool -d" and the sequencer
(i.e. `git rebase -i`, `git cherry-pick` and `git revert`) and others.
In those instances we don't want to update their temporary index with
our virtualization data.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ben Peart <Ben.Peart@microsoft.com>
This commit is contained in:
Ben Peart 2018-08-01 13:26:22 -04:00 коммит произвёл Johannes Schindelin
Родитель 7c8003fc03
Коммит 311056b04c
1 изменённых файлов: 18 добавлений и 4 удалений

Просмотреть файл

@ -2817,11 +2817,25 @@ int git_config_get_virtualfilesystem(void)
if (core_virtualfilesystem && !*core_virtualfilesystem)
core_virtualfilesystem = NULL;
/* virtual file system relies on the sparse checkout logic so force it on */
if (core_virtualfilesystem) {
core_apply_sparse_checkout = 1;
virtual_filesystem_result = 1;
return 1;
/*
* Some git commands spawn helpers and redirect the index to a different
* location. These include "difftool -d" and the sequencer
* (i.e. `git rebase -i`, `git cherry-pick` and `git revert`) and others.
* In those instances we don't want to update their temporary index with
* our virtualization data.
*/
char *default_index_file = xstrfmt("%s/%s", the_repository->gitdir, "index");
int should_run_hook = !strcmp(default_index_file, the_repository->index_file);
free(default_index_file);
if (should_run_hook) {
/* virtual file system relies on the sparse checkout logic so force it on */
core_apply_sparse_checkout = 1;
virtual_filesystem_result = 1;
return 1;
}
core_virtualfilesystem = NULL;
}
virtual_filesystem_result = 0;