mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/maint-fix-test'

Browse Source 
* jl/maint-fix-test:
  Several tests: cd inside subshell instead of around

Conflicts:
	t/t9600-cvsimport.sh
This commit is contained in:
Junio C Hamano
2010-09-06 16:46:36 -07:00
parent c2e0940b44 fd4ec4f2bb
commit 347c47e61e
32 changed files with 256 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
t/t6050-replace.sh
View File

@ -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' '