* [PATCH] t7405: cd inside subshell instead of around
@ 2010-09-01 21:01 Jens Lehmann
2010-09-02 16:29 ` Heiko Voigt
0 siblings, 1 reply; 2+ messages in thread
From: Jens Lehmann @ 2010-09-01 21:01 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List, Heiko Voigt
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t7405: cd inside subshell instead of around
2010-09-01 21:01 [PATCH] t7405: cd inside subshell instead of around Jens Lehmann
@ 2010-09-02 16:29 ` Heiko Voigt
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Voigt @ 2010-09-02 16:29 UTC (permalink / raw)
To: Jens Lehmann; +Cc: Junio C Hamano, Git Mailing List
On Wed, Sep 01, 2010 at 11:01:49PM +0200, Jens Lehmann wrote:
> 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>
That makes the test way more robust, I like it.
cheers Heiko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-02 16:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-01 21:01 [PATCH] t7405: cd inside subshell instead of around Jens Lehmann
2010-09-02 16:29 ` Heiko Voigt
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.