From: Derrick Stolee <dstolee@microsoft.com>
Date: Thu, 1 Apr 2021 01:49:46 +0000 (+0000)
Subject: difftool: ensure full index
X-Git-Tag: v2.32.0-rc0~59^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48b3c7da6c58752b0fbc73e891fd5b24c95281b1;p=thirdparty%2Fgit.git

difftool: ensure full index

Before iterating over all cache entries, ensure that a sparse index has
been expanded to a full one to avoid unexpected behavior.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 6e18e623fd..32c914dde6 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -584,6 +584,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		setenv("GIT_DIFFTOOL_DIRDIFF", "true", 1);
 	rc = run_command_v_opt(helper_argv, flags);
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&wtindex);
+
 	/*
 	 * If the diff includes working copy files and those
 	 * files were modified during the diff, then the changes