Skip to content

Commit

Permalink
t9350: fix careless use of "cd"
Browse files Browse the repository at this point in the history
Upon failure of any of these tests (or when a test that is marked as
expecting a failure is fixed), we will end up running later tests in
random places.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Mar 29, 2010
1 parent 42accae commit 4c367c6
Showing 1 changed file with 38 additions and 33 deletions.
71 changes: 38 additions & 33 deletions t/t9350-fast-export.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,20 +150,22 @@ test_expect_success 'setup submodule' '
git checkout -f master &&
mkdir sub &&
cd sub &&
git init &&
echo test file > file &&
git add file &&
git commit -m sub_initial &&
cd .. &&
(
cd sub &&
git init &&
echo test file > file &&
git add file &&
git commit -m sub_initial
) &&
git submodule add "`pwd`/sub" sub &&
git commit -m initial &&
test_tick &&
cd sub &&
echo more data >> file &&
git add file &&
git commit -m sub_second &&
cd .. &&
(
cd sub &&
echo more data >> file &&
git add file &&
git commit -m sub_second
) &&
git add sub &&
git commit -m second
Expand Down Expand Up @@ -264,19 +266,20 @@ test_expect_success 'cope with tagger-less tags' '

test_expect_success 'setup for limiting exports by PATH' '
mkdir limit-by-paths &&
cd limit-by-paths &&
git init &&
echo hi > there &&
git add there &&
git commit -m "First file" &&
echo foo > bar &&
git add bar &&
git commit -m "Second file" &&
git tag -a -m msg mytag &&
echo morefoo >> bar &&
git add bar &&
git commit -m "Change to second file" &&
cd ..
(
cd limit-by-paths &&
git init &&
echo hi > there &&
git add there &&
git commit -m "First file" &&
echo foo > bar &&
git add bar &&
git commit -m "Second file" &&
git tag -a -m msg mytag &&
echo morefoo >> bar &&
git add bar &&
git commit -m "Change to second file"
)
'

cat > limit-by-paths/expected << EOF
Expand All @@ -297,10 +300,11 @@ M 100644 :1 there
EOF

test_expect_success 'dropping tag of filtered out object' '
(
cd limit-by-paths &&
git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
test_cmp output expected &&
cd ..
test_cmp output expected
)
'

cat >> limit-by-paths/expected << EOF
Expand All @@ -313,10 +317,11 @@ msg
EOF

test_expect_success 'rewriting tag of filtered out object' '
(
cd limit-by-paths &&
git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
test_cmp output expected &&
cd ..
test_cmp output expected
)
'

cat > limit-by-paths/expected << EOF
Expand All @@ -343,13 +348,13 @@ M 100644 :2 there
EOF

test_expect_failure 'no exact-ref revisions included' '
cd limit-by-paths &&
git fast-export master~2..master~1 > output &&
test_cmp output expected &&
cd ..
(
cd limit-by-paths &&
git fast-export master~2..master~1 > output &&
test_cmp output expected
)
'


test_expect_success 'set-up a few more tags for tag export tests' '
git checkout -f master &&
HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` &&
Expand Down

0 comments on commit 4c367c6

Please sign in to comment.