Skip to content

Commit 935a4ff

Browse files
derrickstoleedscho
authored andcommitted
Merge pull request git-for-windows#470: Sparse Index: integrate with git show
As we roll out the sparse index feature, here is a command that I see being used more frequently than other non-integrated commands. (For example, `git mv` is used much less frequently.) Since the index expansion only happens when using `git show :<path>` to indicate that we are looking for a cached value, this is very likely being used by a tool and not directly by users. However, the performance slowdown is around 10x (0.4s to 4.1s at p50). The change here is simple, and we can catch up the performance in the next release. There is a slightly odd behavior change when asking for a directory that now "works" but did not work at all before. See the test change in the second commit for details.
2 parents add2ddb + 79134a4 commit 935a4ff

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

builtin/log.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,9 @@ int cmd_show(int argc, const char **argv, const char *prefix)
648648
init_log_defaults();
649649
git_config(git_log_config, NULL);
650650

651+
prepare_repo_settings(the_repository);
652+
the_repository->settings.command_requires_full_index = 0;
653+
651654
memset(&match_all, 0, sizeof(match_all));
652655
repo_init_revisions(the_repository, &rev, prefix);
653656
rev.diff = 1;

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,6 +1271,34 @@ test_expect_success 'clean' '
12711271
test_sparse_match test_path_is_dir folder1
12721272
'
12731273

1274+
test_expect_success 'show (cached blobs/trees)' '
1275+
init_repos &&
1276+
1277+
test_all_match git show :a &&
1278+
test_all_match git show :deep/a &&
1279+
test_sparse_match git show :folder1/a &&
1280+
1281+
# Asking "git show" for directories in the index
1282+
# does not work as implemented. The error message is
1283+
# different for a full checkout and a sparse checkout
1284+
# when the directory is outside of the cone.
1285+
test_all_match test_must_fail git show :deep/ &&
1286+
test_must_fail git -C full-checkout show :folder1/ &&
1287+
test_must_fail git -C sparse-checkout show :folder1/ &&
1288+
1289+
# The sparse index actually has "folder1" inside, so
1290+
# "git show :folder1/" succeeds when it did not before.
1291+
git -C sparse-index show :folder1/ >actual &&
1292+
git -C sparse-index show HEAD:folder1 >expect &&
1293+
1294+
# The output of "git show" includes the way we
1295+
# referenced the objects, so strip that out.
1296+
test_line_count = 4 actual &&
1297+
tail -n 2 actual >actual-trunc &&
1298+
tail -n 2 expect >expect-trunc &&
1299+
test_cmp expect-trunc actual-trunc
1300+
'
1301+
12741302
test_expect_success 'submodule handling' '
12751303
init_repos &&
12761304
@@ -1385,6 +1413,9 @@ test_expect_success 'sparse-index is not expanded' '
13851413
echo >>sparse-index/untracked.txt &&
13861414
ensure_not_expanded add . &&
13871415
1416+
ensure_not_expanded show :a &&
1417+
ensure_not_expanded show :deep/a &&
1418+
13881419
echo >>sparse-index/a &&
13891420
ensure_not_expanded stash &&
13901421
ensure_not_expanded stash list &&

0 commit comments

Comments
 (0)