Skip to content

Commit d2dd8de

Browse files
vdyederrickstolee
authored andcommitted
stash: expand testing for git stash -u
Test cases specific to handling untracked files in `git stash` a) ensure that files outside the sparse checkout definition are handled as-expected and b) document the index expansion inside of `git stash -u`. Note that, in b), it is not the full repository index that is expanded - it is the temporary, standalone index containing the stashed untracked files only. Signed-off-by: Victoria Dye <[email protected]>
1 parent d5cd12b commit d2dd8de

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

t/perf/p2000-sparse-operations.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ test_perf_on_all () {
107107

108108
test_perf_on_all git status
109109
test_perf_on_all 'git stash && git stash pop'
110+
test_perf_on_all 'echo >>new && git stash -u && git stash pop'
110111
test_perf_on_all git add -A
111112
test_perf_on_all git add .
112113
test_perf_on_all git commit -a -m A

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,46 @@ test_expect_success 'sparse index is not expanded: read-tree' '
13831383
ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
13841384
'
13851385

1386+
# NEEDSWORK: although the full repository's index is _not_ expanded as part of
1387+
# stash, a temporary index, which is _not_ sparse, is created when stashing and
1388+
# applying a stash of untracked files. As a result, the test reports that it
1389+
# finds an instance of `ensure_full_index`, but it does not carry with it the
1390+
# performance implications of expanding the full repository index.
1391+
test_expect_success 'sparse index is not expanded: stash -u' '
1392+
init_repos &&
1393+
1394+
mkdir -p sparse-index/folder1 &&
1395+
echo >>sparse-index/README.md &&
1396+
echo >>sparse-index/a &&
1397+
echo >>sparse-index/folder1/new &&
1398+
1399+
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
1400+
git -C sparse-index stash -u &&
1401+
test_region index ensure_full_index trace2.txt &&
1402+
1403+
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
1404+
git -C sparse-index stash pop &&
1405+
test_region index ensure_full_index trace2.txt
1406+
'
1407+
1408+
# NEEDSWORK: similar to `git add`, untracked files outside of the sparse
1409+
# checkout definition are successfully stashed and unstashed.
1410+
test_expect_success 'stash -u outside sparse checkout definition' '
1411+
init_repos &&
1412+
1413+
write_script edit-contents <<-\EOF &&
1414+
echo text >>$1
1415+
EOF
1416+
1417+
run_on_sparse mkdir -p folder1 &&
1418+
run_on_all ../edit-contents folder1/new &&
1419+
test_all_match git stash -u &&
1420+
test_all_match git status --porcelain=v2 &&
1421+
1422+
test_all_match git stash pop -q &&
1423+
test_all_match git status --porcelain=v2
1424+
'
1425+
13861426
# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
13871427
# in this scenario, but it shouldn't.
13881428
test_expect_success 'reset mixed and checkout orphan' '

0 commit comments

Comments
 (0)