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.

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

Sparse index: integrate with git stash #428

Merged
merged 6 commits into from
Sep 21, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 1 addition & 1 deletion t/perf/run
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ set_git_test_installed () {
mydir=$1

mydir_abs=$(cd $mydir && pwd)
mydir_abs_wrappers="$mydir_abs_wrappers/bin-wrappers"
mydir_abs_wrappers="$mydir_abs/bin-wrappers"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just an FYI: I sent this upstream via gitgitgadget#1044, since it is so simple.

See https://lore.kernel.org/git/[email protected]/T/#u for the discussion.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case, should I remove it from this branch? Or will it disappear once vfs-2.33.0 is rebased?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will disappear during the rebase onto v2.34.0 (assuming it gets in quickly).

if test -d "$mydir_abs_wrappers"
then
GIT_TEST_INSTALLED=$mydir_abs_wrappers
Expand Down
2 changes: 1 addition & 1 deletion t/t1092-sparse-checkout-compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ test_expect_success 'reset with wildcard pathspec' '

test_all_match git checkout -b reset-test update-deep &&
test_all_match git reset --hard update-folder1 &&
test_all_match git reset base -- */a &&
test_all_match git reset base -- \*/a &&
test_all_match git status --porcelain=v2
'

Expand Down