Skip to content

Commit 88bab59

Browse files
peffgitster
authored andcommitted
t3903: avoid applying onto dirty index
One of the tests in t3903 wants to make sure that applying a stash that touches only "file" can still happen even if there are working tree changes to "other-file". To do so, it adds "other-file" to the index (since otherwise it is an untracked file, voiding the purpose of the test). But as we are about to refactor the dirty-index handling, and as this test does not actually care about having a dirty index (only a dirty working tree), let's bump the tracking of "other-file" into the setup phase, so we can have _just_ a dirty working tree here. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f2f3fc9 commit 88bab59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t3903-stash.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ test_description='Test git stash'
1010
test_expect_success 'stash some dirty working directory' '
1111
echo 1 > file &&
1212
git add file &&
13+
echo unrelated >other-file &&
14+
git add other-file &&
1315
test_tick &&
1416
git commit -m initial &&
1517
echo 2 > file &&
@@ -45,8 +47,6 @@ test_expect_success 'applying bogus stash does nothing' '
4547

4648
test_expect_success 'apply does not need clean working directory' '
4749
echo 4 >other-file &&
48-
git add other-file &&
49-
echo 5 >other-file &&
5050
git stash apply &&
5151
echo 3 >expect &&
5252
test_cmp expect file

0 commit comments

Comments
 (0)