git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] t3404 & t7508: cd inside subshell instead of around
Date: Mon, 06 Sep 2010 20:41:06 +0200	[thread overview]
Message-ID: <4C8535C2.5050203@web.de> (raw)

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 <Jens.Lehmann@web.de>
---

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(-)

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index af3b663..7d20a74 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 18b07d9..c9300f3 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

-- 
1.7.3.rc0.181.g885f40

                 reply	other threads:[~2010-09-06 18:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C8535C2.5050203@web.de \
    --to=jens.lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).