Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

blame: enable and test the sparse index #431

Merged
merged 2 commits into from
Sep 27, 2021
Merged

blame: enable and test the sparse index #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
058b7a9
blame: enable and test the sparse index
ldennington Sep 17, 2021
dd14948
fixup! t1092: test interesting sparse-checkout scenarios
ldennington Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions builtin/blame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
long anchor;
const int hexsz = the_hash_algo->hexsz;

prepare_repo_settings(the_repository);
ldennington marked this conversation as resolved.
Show resolved Hide resolved
the_repository->settings.command_requires_full_index = 0;
setup_default_color_by_age();
git_config(git_blame_config, &output_option);
repo_init_revisions(the_repository, &revs, NULL);
Expand Down
2 changes: 2 additions & 0 deletions t/perf/p2000-sparse-operations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,7 @@ test_perf_on_all git update-index --add --remove
test_perf_on_all git diff
test_perf_on_all git diff --staged
test_perf_on_all git sparse-checkout reapply
test_perf_on_all git blame $SPARSE_CONE/a
test_perf_on_all git blame $SPARSE_CONE/f3/a

test_done
20 changes: 15 additions & 5 deletions t/t1092-sparse-checkout-compatibility.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,13 +488,14 @@ test_expect_success 'blame with pathspec inside sparse definition' '

# TODO: blame currently does not support blaming files outside of the
# sparse definition. It complains that the file doesn't exist locally.
test_expect_failure 'blame with pathspec outside sparse definition' '
test_expect_success 'blame with pathspec outside sparse definition' '
ldennington marked this conversation as resolved.
Show resolved Hide resolved
init_repos &&

test_all_match git blame folder1/a &&
test_all_match git blame folder2/a &&
test_all_match git blame deep/deeper2/a &&
test_all_match git blame deep/deeper2/deepest/a
test_sparse_match git sparse-checkout set &&
test_sparse_match test_must_fail git blame folder1/a &&
test_sparse_match test_must_fail git blame folder2/a &&
test_sparse_match test_must_fail git blame deep/deeper2/a &&
test_sparse_match test_must_fail git blame deep/deeper2/deepest/a
'

# TODO: This behaves correctly in microsoft/git. Why?
Expand Down Expand Up @@ -1322,6 +1323,15 @@ test_expect_success 'stash -u outside sparse checkout definition' '
test_all_match git status --porcelain=v2
'

test_expect_success 'sparse index is not expanded: blame' '
ldennington marked this conversation as resolved.
Show resolved Hide resolved
init_repos &&

ensure_not_expanded blame a &&
ensure_not_expanded blame deep/a &&
ensure_not_expanded blame deep/deeper1/a &&
ensure_not_expanded blame deep/deeper1/deepest/a
'

# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
# in this scenario, but it shouldn't.
test_expect_success 'reset mixed and checkout orphan' '
Expand Down