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>
Jeff King committed
Jul 16, 2011 at 15:03 UTC
5cf5ade371d60f97fef2eb7ef37780ed86fa4963
1 file changed
+8
-4
t/t5800-remote-helpers.sh
+8
-4
@@ -17,6 +17,12 @@ then
17
test_set_prereq PYTHON_24
18
fi
19
20
+compare_refs() {
21
+ git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
22
+ git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
23
+ test_cmp expect actual
24
+}
25
+
26
test_expect_success PYTHON_24 'setup repository' '
27
git init --bare server/.git &&
28
git clone server public &&
@@ -59,8 +65,7 @@ test_expect_success PYTHON_24 'pushing to local repo' '
65
echo content >>file &&
66
git commit -a -m three &&
67
git push) &&
62
- HEAD=$(git --git-dir=localclone/.git rev-parse --verify HEAD) &&
63
- test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
68
+ compare_refs localclone HEAD server HEAD
69
'
70
71
test_expect_success PYTHON_24 'synch with changes from localclone' '
@@ -73,8 +78,7 @@ test_expect_success PYTHON_24 'pushing remote local repo' '
78
echo content >>file &&
79
git commit -a -m four &&
80
git push) &&
76
- HEAD=$(git --git-dir=clone/.git rev-parse --verify HEAD) &&
77
- test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
81
+ compare_refs clone HEAD server HEAD
82
'
83
84
test_done