Merge branch 'aw/git-p4-deletion' into maint

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index af3b663aeee8354c6f8f2dff05666f6d70c07055..7d20a74c5ca1331ff241d1596bcb114e48a5907d 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -101,10 +101,10 @@ test_expect_success 'rebase -i with the exec command' '
 
 test_expect_success 'rebase -i with the exec command runs from tree root' '
        git checkout master &&
-       mkdir subdir && cd subdir &&
+       mkdir subdir && (cd subdir &&
        FAKE_LINES="1 exec_>touch-subdir" \
-               git rebase -i HEAD^ &&
-       cd .. &&
+               git rebase -i HEAD^
+       ) &&
        test_path_is_file touch-subdir &&
        rm -fr subdir
 '