Skip to content

Commit aec51ee

Browse files
vdyedscho
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 b6b7111 commit aec51ee

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
@@ -1321,6 +1321,46 @@ test_expect_success 'sparse index is not expanded: read-tree' '
13211321
ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
13221322
'
13231323

1324+
# NEEDSWORK: although the full repository's index is _not_ expanded as part of
1325+
# stash, a temporary index, which is _not_ sparse, is created when stashing and
1326+
# applying a stash of untracked files. As a result, the test reports that it
1327+
# finds an instance of `ensure_full_index`, but it does not carry with it the
1328+
# performance implications of expanding the full repository index.
1329+
test_expect_success 'sparse index is not expanded: stash -u' '
1330+
init_repos &&
1331+
1332+
mkdir -p sparse-index/folder1 &&
1333+
echo >>sparse-index/README.md &&
1334+
echo >>sparse-index/a &&
1335+
echo >>sparse-index/folder1/new &&
1336+
1337+
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
1338+
git -C sparse-index stash -u &&
1339+
test_region index ensure_full_index trace2.txt &&
1340+
1341+
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
1342+
git -C sparse-index stash pop &&
1343+
test_region index ensure_full_index trace2.txt
1344+
'
1345+
1346+
# NEEDSWORK: similar to `git add`, untracked files outside of the sparse
1347+
# checkout definition are successfully stashed and unstashed.
1348+
test_expect_success 'stash -u outside sparse checkout definition' '
1349+
init_repos &&
1350+
1351+
write_script edit-contents <<-\EOF &&
1352+
echo text >>$1
1353+
EOF
1354+
1355+
run_on_sparse mkdir -p folder1 &&
1356+
run_on_all ../edit-contents folder1/new &&
1357+
test_all_match git stash -u &&
1358+
test_all_match git status --porcelain=v2 &&
1359+
1360+
test_all_match git stash pop -q &&
1361+
test_all_match git status --porcelain=v2
1362+
'
1363+
13241364
# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
13251365
# in this scenario, but it shouldn't.
13261366
test_expect_success 'reset mixed and checkout orphan' '

0 commit comments

Comments
 (0)