t6022: Add tests with both rename source & dest involved in D/F conflicts

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index d99f27a12f40d73094ef286a067f3c6771e61865..a283dca25fe9b5d75841626337e0e68244fdbbf2 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -69,9 +69,10 @@ test_expect_success 'apply stashed changes (including index)' '
 test_expect_success 'unstashing in a subdirectory' '
        git reset --hard HEAD &&
        mkdir subdir &&
-       cd subdir &&
-       git stash apply &&
-       cd ..
+       (
+               cd subdir &&
+               git stash apply
+       )
 '
 
 test_expect_success 'drop top stash' '