t5800: factor out some ref tests

These are a little hard to read, and I'm about to add more
just like them. Plus the failure output is nicer if we use
test_cmp than a comparison with "test".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 1fb6380fceb294f1a7cc73359f5e39740260d8f0..3a37ad07078893b35ec4df01482b4c639c060051 100755 (executable)
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -17,6 +17,12 @@ then
        test_set_prereq PYTHON_24
 fi
 
        test_set_prereq PYTHON_24
 fi
 

+compare_refs() {
+       git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
+       git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
+       test_cmp expect actual
+}
+

 test_expect_success PYTHON_24 'setup repository' '
        git init --bare server/.git &&
        git clone server public &&
 test_expect_success PYTHON_24 'setup repository' '
        git init --bare server/.git &&
        git clone server public &&


@@ -59,8 +65,7 @@ test_expect_success PYTHON_24 'pushing to local repo' '
        echo content >>file &&
        git commit -a -m three &&
        git push) &&
        echo content >>file &&
        git commit -a -m three &&
        git push) &&

-       HEAD=$(git --git-dir=localclone/.git rev-parse --verify HEAD) &&
-       test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
+       compare_refs localclone HEAD server HEAD

 '
 
 test_expect_success PYTHON_24 'synch with changes from localclone' '
 '
 
 test_expect_success PYTHON_24 'synch with changes from localclone' '


@@ -73,8 +78,7 @@ test_expect_success PYTHON_24 'pushing remote local repo' '
        echo content >>file &&
        git commit -a -m four &&
        git push) &&
        echo content >>file &&
        git commit -a -m four &&
        git push) &&

-       HEAD=$(git --git-dir=clone/.git rev-parse --verify HEAD) &&
-       test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
+       compare_refs clone HEAD server HEAD

 '
 
 test_done
 '
 
 test_done