t5801 (remote-helpers): cleanup refspec stuff

The code is much simpler this way, specially thanks to:

git fast-export --refspec

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

diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
index 752c763eb666e197304efbc7ea006325a36ff870..f2b551dfafcf7aa08c4fc23c315f8e6eb0bb12ce 100755 (executable)
--- a/git-remote-testgit.sh
+++ b/git-remote-testgit.sh
@@ -11,13 +11,10 @@ fi
 url=$2
 
 dir="$GIT_DIR/testgit/$alias"
 url=$2
 
 dir="$GIT_DIR/testgit/$alias"

-prefix="refs/testgit/$alias"

 
 

-default_refspec="refs/heads/*:${prefix}/heads/*"
+refspec="refs/heads/*:refs/testgit/$alias/heads/*"

 
 

-refspec="${GIT_REMOTE_TESTGIT_REFSPEC-$default_refspec}"
-
-test -z "$refspec" && prefix="refs"
+test -n "$GIT_REMOTE_TESTGIT_NOREFSPEC" && refspec=""

 
 GIT_DIR="$url/.git"
 export GIT_DIR
 
 GIT_DIR="$url/.git"
 export GIT_DIR


@@ -81,10 +78,10 @@ do
 
                echo "feature done"
                git fast-export \
 
                echo "feature done"
                git fast-export \

+                       ${refspec:+"--refspec=$refspec"} \

                        ${testgitmarks:+"--import-marks=$testgitmarks"} \
                        ${testgitmarks:+"--export-marks=$testgitmarks"} \
                        ${testgitmarks:+"--import-marks=$testgitmarks"} \
                        ${testgitmarks:+"--export-marks=$testgitmarks"} \

-                       $refs |
-               sed -e "s#refs/heads/#${prefix}/heads/#g"
+                       $refs

                echo "done"
                ;;
        export)
                echo "done"
                ;;
        export)

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index aaaa722ccab016cc5847d5b6bbc5a3879a0b3fbc..9d1a514d18bc8705fcf85fd607044ac3a5db238d 100755 (executable)
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -124,7 +124,7 @@ test_expect_success 'forced push' '
 '
 
 test_expect_success 'cloning without refspec' '
 '
 
 test_expect_success 'cloning without refspec' '

-       GIT_REMOTE_TESTGIT_REFSPEC="" \
+       GIT_REMOTE_TESTGIT_NOREFSPEC=1 \

        git clone "testgit::${PWD}/server" local2 2>error &&
        test_i18ngrep "this remote helper should implement refspec capability" error &&
        compare_refs local2 HEAD server HEAD
        git clone "testgit::${PWD}/server" local2 2>error &&
        test_i18ngrep "this remote helper should implement refspec capability" error &&
        compare_refs local2 HEAD server HEAD


@@ -133,7 +133,7 @@ test_expect_success 'cloning without refspec' '
 test_expect_success 'pulling without refspecs' '
        (cd local2 &&
        git reset --hard &&
 test_expect_success 'pulling without refspecs' '
        (cd local2 &&
        git reset --hard &&

-       GIT_REMOTE_TESTGIT_REFSPEC="" git pull 2>../error) &&
+       GIT_REMOTE_TESTGIT_NOREFSPEC=1 git pull 2>../error) &&

        test_i18ngrep "this remote helper should implement refspec capability" error &&
        compare_refs local2 HEAD server HEAD
 '
        test_i18ngrep "this remote helper should implement refspec capability" error &&
        compare_refs local2 HEAD server HEAD
 '


@@ -143,8 +143,8 @@ test_expect_success 'pushing without refspecs' '
        (cd local2 &&
        echo content >>file &&
        git commit -a -m ten &&
        (cd local2 &&
        echo content >>file &&
        git commit -a -m ten &&

-       GIT_REMOTE_TESTGIT_REFSPEC="" &&
-       export GIT_REMOTE_TESTGIT_REFSPEC &&
+       GIT_REMOTE_TESTGIT_NOREFSPEC=1 &&
+       export GIT_REMOTE_TESTGIT_NOREFSPEC &&

        test_must_fail git push 2>../error) &&
        test_i18ngrep "remote-helper doesn.t support push; refspec needed" error
 '
        test_must_fail git push 2>../error) &&
        test_i18ngrep "remote-helper doesn.t support push; refspec needed" error
 '