Skip to content

Commit aff09df

Browse files
benpeartdscho
authored andcommitted
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 <[email protected]> Signed-off-by: Ben Peart <[email protected]>
1 parent b4458d9 commit aff09df

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

config.c

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,11 +2541,25 @@ int git_config_get_virtualfilesystem(void)
25412541
if (core_virtualfilesystem && !*core_virtualfilesystem)
25422542
core_virtualfilesystem = NULL;
25432543

2544-
/* virtual file system relies on the sparse checkout logic so force it on */
25452544
if (core_virtualfilesystem) {
2546-
core_apply_sparse_checkout = 1;
2547-
virtual_filesystem_result = 1;
2548-
return 1;
2545+
/*
2546+
* Some git commands spawn helpers and redirect the index to a different
2547+
* location. These include "difftool -d" and the sequencer
2548+
* (i.e. `git rebase -i`, `git cherry-pick` and `git revert`) and others.
2549+
* In those instances we don't want to update their temporary index with
2550+
* our virtualization data.
2551+
*/
2552+
char *default_index_file = xstrfmt("%s/%s", the_repository->gitdir, "index");
2553+
int should_run_hook = !strcmp(default_index_file, the_repository->index_file);
2554+
2555+
free(default_index_file);
2556+
if (should_run_hook) {
2557+
/* virtual file system relies on the sparse checkout logic so force it on */
2558+
core_apply_sparse_checkout = 1;
2559+
virtual_filesystem_result = 1;
2560+
return 1;
2561+
}
2562+
core_virtualfilesystem = NULL;
25492563
}
25502564

25512565
virtual_filesystem_result = 0;

0 commit comments

Comments
 (0)