From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, Heiko Voigt <hvoigt@hvoigt.net>
Subject: [PATCH] t7405: cd inside subshell instead of around
Date: Wed, 01 Sep 2010 23:01:49 +0200 [thread overview]
Message-ID: <4C7EBF3D.9030806@web.de> (raw)
Instead of using `cd dir && (...) && cd..` use `(cd dir && ...)`
This ensures that the test doesn't get caught in the subdirectory if there
is an error in the subshell.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
t/t7405-submodule-merge.sh | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 6ec559d..7e2e258 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -67,7 +67,7 @@ test_expect_success setup '
# b in the main repository.
test_expect_success 'setup for merge search' '
mkdir merge-search &&
- cd merge-search &&
+ (cd merge-search &&
git init &&
mkdir sub &&
(cd sub &&
@@ -101,8 +101,7 @@ test_expect_success 'setup for merge search' '
git checkout -b sub-d sub-b &&
git merge sub-c) &&
git commit -a -m "d" &&
- git branch test b &&
- cd ..
+ git branch test b)
'
test_expect_success 'merge with one side as a fast-forward of the other' '
@@ -126,7 +125,7 @@ test_expect_success 'merging should conflict for non fast-forward' '
'
test_expect_success 'merging should fail for ambiguous common parent' '
- cd merge-search &&
+ (cd merge-search &&
git checkout -b test-ambiguous b &&
(cd sub &&
git checkout -b ambiguous sub-b &&
@@ -136,8 +135,7 @@ test_expect_success 'merging should fail for ambiguous common parent' '
test_must_fail git merge c 2> actual &&
grep $(cat expect1) actual > /dev/null &&
grep $(cat expect2) actual > /dev/null &&
- git reset --hard &&
- cd ..
+ git reset --hard)
'
# in a situation like this
@@ -158,7 +156,7 @@ test_expect_success 'merging should fail for ambiguous common parent' '
# commits (sub-a) does not descend from the submodule merge-base (sub-b).
#
test_expect_success 'merging should fail for changes that are backwards' '
- cd merge-search &&
+ (cd merge-search &&
git checkout -b bb a &&
(cd sub &&
git checkout sub-b) &&
@@ -175,16 +173,13 @@ test_expect_success 'merging should fail for changes that are backwards' '
git commit -a -m "f" &&
git checkout -b test-backward e &&
- test_must_fail git merge f &&
- cd ..
+ test_must_fail git merge f)
'
test_expect_success 'merging with a modify/modify conflict between merge bases' '
-
git reset --hard HEAD &&
git checkout -b test2 c &&
git merge d
-
'
test_done
--
1.7.2.2.552.gabce9
next reply other threads:[~2010-09-01 21:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-01 21:01 Jens Lehmann [this message]
2010-09-02 16:29 ` [PATCH] t7405: cd inside subshell instead of around Heiko Voigt
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=4C7EBF3D.9030806@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.