remote-hg: test: simplify previous branch checkout

@{-1} does the same thing.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
index 1aadf35eb22ded0a78d6f99d9c61deb1f401ba33..f0aa3c06c15491c72f072c11a83e41780baff140 100755 (executable)
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@ -41,10 +41,9 @@ hg_clone () {
 hg_push () {
        (
        cd $2
 hg_push () {
        (
        cd $2

-       old=$(git symbolic-ref --short HEAD)

        git checkout -q -b tmp &&
        git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
        git checkout -q -b tmp &&
        git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&

-       git checkout -q $old &&
+       git checkout -q @{-1} &&

        git branch -q -D tmp 2> /dev/null || true
        )
 }
        git branch -q -D tmp 2> /dev/null || true
        )
 }

diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh
index c2e7316385e05c74a804699a1a1a3f996943e252..37e59d8fe8a755fdd858f369ad8661a3b498f356 100755 (executable)
--- a/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/contrib/remote-helpers/test-hg-hg-git.sh
@@ -61,10 +61,9 @@ hg_clone_hg () {
 hg_push_git () {
        (
        cd $2
 hg_push_git () {
        (
        cd $2

-       old=$(git symbolic-ref --short HEAD)

        git checkout -q -b tmp &&
        git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
        git checkout -q -b tmp &&
        git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&

-       git checkout -q $old &&
+       git checkout -q @{-1} &&

        git branch -q -D tmp 2> /dev/null || true
        )
 }
        git branch -q -D tmp 2> /dev/null || true
        )
 }