mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
remote-hg: trivial test cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8120014e2b
commit
71c6c95c31
2 changed files with 3 additions and 5 deletions
|
@ -22,7 +22,6 @@ fi
|
||||||
|
|
||||||
# clone to a git repo
|
# clone to a git repo
|
||||||
git_clone () {
|
git_clone () {
|
||||||
hg -R $1 bookmark -f -r tip master &&
|
|
||||||
git clone -q "hg::$PWD/$1" $2
|
git clone -q "hg::$PWD/$1" $2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,8 +200,8 @@ test_expect_success 'hg branch' '
|
||||||
hg_push hgrepo gitrepo &&
|
hg_push hgrepo gitrepo &&
|
||||||
hg_clone gitrepo hgrepo2 &&
|
hg_clone gitrepo hgrepo2 &&
|
||||||
|
|
||||||
: TODO, avoid "master" bookmark &&
|
: Back to the common revision &&
|
||||||
(cd hgrepo2 && hg checkout gamma) &&
|
(cd hgrepo && hg checkout default) &&
|
||||||
|
|
||||||
hg_log hgrepo > expected &&
|
hg_log hgrepo > expected &&
|
||||||
hg_log hgrepo2 > actual &&
|
hg_log hgrepo2 > actual &&
|
||||||
|
|
|
@ -27,7 +27,6 @@ fi
|
||||||
|
|
||||||
# clone to a git repo with git
|
# clone to a git repo with git
|
||||||
git_clone_git () {
|
git_clone_git () {
|
||||||
hg -R $1 bookmark -f -r tip master &&
|
|
||||||
git clone -q "hg::$PWD/$1" $2
|
git clone -q "hg::$PWD/$1" $2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +47,7 @@ git_clone_hg () {
|
||||||
(
|
(
|
||||||
git init -q $2 &&
|
git init -q $2 &&
|
||||||
cd $1 &&
|
cd $1 &&
|
||||||
hg bookmark -f -r tip master &&
|
hg bookmark -i -f -r tip master &&
|
||||||
hg -q push -r master ../$2 || true
|
hg -q push -r master ../$2 || true
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue