From c2e0940b44ded03f0af02be95c35b231fea633c1 Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Mon, 6 Sep 2010 20:41:06 +0200 Subject: [PATCH] t3404 & t7508: cd inside subshell instead of around Fixed all places where it was a straightforward change from cd'ing into a directory and back via "cd .." to a cd inside a subshell. Found these places with "git grep -w "cd \.\.". Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t3404-rebase-interactive.sh | 6 +++--- t/t7508-status.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index af3b663aee..7d20a74c5c 100755 --- 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 ' diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 18b07d9d36..c9300f3c8b 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -808,7 +808,7 @@ test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' (exit $status) ' -(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar' && cd .. && git add sm) +(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm new_head=$(cd sm && git rev-parse --short=7 --verify HEAD) touch .gitmodules -- 2.11.4.GIT