diff --git a/test-hg-bidi.sh b/test-hg-bidi.sh index 676b1ab..1aadf35 100755 --- a/test-hg-bidi.sh +++ b/test-hg-bidi.sh @@ -22,7 +22,7 @@ fi # clone to a git repo git_clone () { - git clone -q "hg::$PWD/$1" $2 + git clone -q "hg::$1" $2 } # clone to an hg repo @@ -31,7 +31,7 @@ hg_clone () { hg init $2 && hg -R $2 bookmark -i master && cd $1 && - git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' + git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' ) && (cd $2 && hg -q update) @@ -43,7 +43,7 @@ hg_push () { cd $2 old=$(git symbolic-ref --short HEAD) git checkout -q -b tmp && - git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' && + git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' && git checkout -q $old && git branch -q -D tmp 2> /dev/null || true ) diff --git a/test-hg-hg-git.sh b/test-hg-hg-git.sh index 041041d..c2e7316 100755 --- a/test-hg-hg-git.sh +++ b/test-hg-hg-git.sh @@ -27,7 +27,7 @@ fi # clone to a git repo with git git_clone_git () { - git clone -q "hg::$PWD/$1" $2 + git clone -q "hg::$1" $2 } # clone to an hg repo with git @@ -36,7 +36,7 @@ hg_clone_git () { hg init $2 && hg -R $2 bookmark -i master && cd $1 && - git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' + git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' ) && (cd $2 && hg -q update) @@ -63,7 +63,7 @@ hg_push_git () { cd $2 old=$(git symbolic-ref --short HEAD) git checkout -q -b tmp && - git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' && + git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' && git checkout -q $old && git branch -q -D tmp 2> /dev/null || true ) diff --git a/test-hg.sh b/test-hg.sh index f986db0..c54adb6 100755 --- a/test-hg.sh +++ b/test-hg.sh @@ -53,7 +53,7 @@ test_expect_success 'cloning' ' hg commit -m zero ) && - git clone "hg::$PWD/hgrepo" gitrepo && + git clone "hg::hgrepo" gitrepo && check gitrepo zero master ' @@ -67,12 +67,12 @@ test_expect_success 'cloning with branches' ' hg commit -m next ) && - git clone "hg::$PWD/hgrepo" gitrepo && + git clone "hg::hgrepo" gitrepo && check gitrepo next next && (cd hgrepo && hg checkout default) && - git clone "hg::$PWD/hgrepo" gitrepo2 && + git clone "hg::hgrepo" gitrepo2 && check gitrepo2 zero master ' @@ -86,7 +86,7 @@ test_expect_success 'cloning with bookmarks' ' hg commit -m feature-a ) && - git clone "hg::$PWD/hgrepo" gitrepo && + git clone "hg::hgrepo" gitrepo && check gitrepo feature-a feature-a ' @@ -98,7 +98,7 @@ test_expect_success 'cloning with detached head' ' hg update -r 0 ) && - git clone "hg::$PWD/hgrepo" gitrepo && + git clone "hg::hgrepo" gitrepo && check gitrepo zero master ' @@ -111,7 +111,7 @@ test_expect_success 'update bookmark' ' ) && ( - git clone "hg::$PWD/hgrepo" gitrepo && + git clone "hg::hgrepo" gitrepo && cd gitrepo && git checkout --quiet devel && echo devel > content && @@ -155,7 +155,7 @@ test_expect_success 'authors' ' author_test kappa "test@example.com" "Unknown " ) && - git clone "hg::$PWD/hgrepo" gitrepo && + git clone "hg::hgrepo" gitrepo && git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && test_cmp expected actual