Skip to contentSkip to conversation

t3404 & t7508: cd inside subshell instead of around

PATCH New Jens Lehmann 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 \.\.".

---

This patch applies on top of master and contains the changes that don't apply to maint.

 t/t3404-rebase-interactive.sh |    6 +++---
 t/t7508-status.sh             |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
t/t3404-rebase-interactive.sh +3 -3
index af3b663..7d20a74 100755
@@ -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
 '
t/t7508-status.sh +1 -1
index 18b07d9..c9300f3 100755
@@ -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
 
Signature · 1 line
1.7.3.rc0.181.g885f40