diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 23:46:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 23:46:36 (GMT) |
| commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
| tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t6050-replace.sh | |
| parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
| parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
| download | git-347c47e61e5daf1efb3503724a431e4316c6eb5b.zip git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.gz git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.bz2 | |
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test:
Several tests: cd inside subshell instead of around
Conflicts:
t/t9600-cvsimport.sh
Diffstat (limited to 't/t6050-replace.sh')
| -rwxr-xr-x | t/t6050-replace.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index dd917d7..1911802 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -104,7 +104,7 @@ test_expect_success '"git fsck" works' ' test_expect_success 'repack, clone and fetch work' ' git repack -a -d && git clone --no-hardlinks . clone_dir && - cd clone_dir && + (cd clone_dir && git show HEAD~5 | grep "A U Thor" && git show $HASH2 | grep "A U Thor" && git cat-file commit $R && @@ -113,8 +113,8 @@ test_expect_success 'repack, clone and fetch work' ' git fetch ../ "refs/replace/*:refs/replace/*" && git show HEAD~5 | grep "O Thor" && git show $HASH2 | grep "O Thor" && - git cat-file commit $R && - cd .. + git cat-file commit $R + ) ' test_expect_success '"git replace" listing and deleting' ' @@ -177,10 +177,10 @@ test_expect_success 'create parallel branch without the bug' ' test_expect_success 'push to cloned repo' ' git push cloned $HASH6^:refs/heads/parallel && - cd clone_dir && + (cd clone_dir && git checkout parallel && - git log --pretty=oneline | grep $PARA2 && - cd .. + git log --pretty=oneline | grep $PARA2 + ) ' test_expect_success 'push branch with replacement' ' @@ -191,20 +191,20 @@ test_expect_success 'push branch with replacement' ' git show $HASH6~2 | grep "O Thor" && git show $PARA3 | grep "O Thor" && git push cloned $HASH6^:refs/heads/parallel2 && - cd clone_dir && + (cd clone_dir && git checkout parallel2 && git log --pretty=oneline | grep $PARA3 && - git show $PARA3 | grep "A U Thor" && - cd .. + git show $PARA3 | grep "A U Thor" + ) ' test_expect_success 'fetch branch with replacement' ' git branch tofetch $HASH6 && - cd clone_dir && + (cd clone_dir && git fetch origin refs/heads/tofetch:refs/heads/parallel3 git log --pretty=oneline parallel3 | grep $PARA3 git show $PARA3 | grep "A U Thor" - cd .. + ) ' test_expect_success 'bisect and replacements' ' |