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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Apr 22, 2015 at 15:30 UTC
88bab59c5bf8de2a1577c3134f4dff1e225409e2
1 file changed
+2
-2
t/t3903-stash.sh
+2
-2
@@ -10,6 +10,8 @@ test_description='Test git stash'
10
test_expect_success 'stash some dirty working directory' '
11
echo 1 > file &&
12
git add file &&
13
+ echo unrelated >other-file &&
14
+ git add other-file &&
15
test_tick &&
16
git commit -m initial &&
17
echo 2 > file &&
@@ -45,8 +47,6 @@ test_expect_success 'applying bogus stash does nothing' '
47
48
test_expect_success 'apply does not need clean working directory' '
49
echo 4 >other-file &&
48
- git add other-file &&
49
- echo 5 >other-file &&
50
git stash apply &&
51
echo 3 >expect &&
52
test_cmp expect file