t5512: stop losing git exit code in here-docs
The expected references are generated using a here-doc with some inline command substitutions. If one of the `git rev-parse` invocations within the command substitutions fails, its return code is swallowed and we won't know about it. Replace these command substitutions with generate_references(), which actually reports when `git rev-parse` fails. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Mar 26, 2020 at 04:27 UTC
3227ddc97f7e268488791161a88760dbdaf4e6a9
1 file changed
+35
-29
t/t5512-ls-remote.sh
+35
-29
@@ -4,6 +4,14 @@ test_description='git ls-remote'
4
5
. ./test-lib.sh
6
7
+generate_references () {
8
+ for ref
9
+ do
10
+ oid=$(git rev-parse "$ref") &&
11
+ printf '%s\t%s\n' "$oid" "$ref" || return 1
12
+ done
13
+}
14
+
15
test_expect_success setup '
16
>file &&
17
git add file &&
@@ -43,34 +51,31 @@ test_expect_success 'ls-remote self' '
51
'
52
53
test_expect_success 'ls-remote --sort="version:refname" --tags self' '
46
- cat >expect <<-EOF &&
47
- $(git rev-parse mark) refs/tags/mark
48
- $(git rev-parse mark1.1) refs/tags/mark1.1
49
- $(git rev-parse mark1.2) refs/tags/mark1.2
50
- $(git rev-parse mark1.10) refs/tags/mark1.10
51
- EOF
54
+ generate_references \
55
+ refs/tags/mark \
56
+ refs/tags/mark1.1 \
57
+ refs/tags/mark1.2 \
58
+ refs/tags/mark1.10 >expect &&
59
git ls-remote --sort="version:refname" --tags self >actual &&
60
test_cmp expect actual
61
'
62
63
test_expect_success 'ls-remote --sort="-version:refname" --tags self' '
57
- cat >expect <<-EOF &&
58
- $(git rev-parse mark1.10) refs/tags/mark1.10
59
- $(git rev-parse mark1.2) refs/tags/mark1.2
60
- $(git rev-parse mark1.1) refs/tags/mark1.1
61
- $(git rev-parse mark) refs/tags/mark
62
- EOF
64
+ generate_references \
65
+ refs/tags/mark1.10 \
66
+ refs/tags/mark1.2 \
67
+ refs/tags/mark1.1 \
68
+ refs/tags/mark >expect &&
69
git ls-remote --sort="-version:refname" --tags self >actual &&
70
test_cmp expect actual
71
'
72
73
test_expect_success 'ls-remote --sort="-refname" --tags self' '
68
- cat >expect <<-EOF &&
69
- $(git rev-parse mark1.2) refs/tags/mark1.2
70
- $(git rev-parse mark1.10) refs/tags/mark1.10
71
- $(git rev-parse mark1.1) refs/tags/mark1.1
72
- $(git rev-parse mark) refs/tags/mark
73
- EOF
74
+ generate_references \
75
+ refs/tags/mark1.2 \
76
+ refs/tags/mark1.10 \
77
+ refs/tags/mark1.1 \
78
+ refs/tags/mark >expect &&
79
git ls-remote --sort="-refname" --tags self >actual &&
80
test_cmp expect actual
81
'
@@ -212,17 +217,18 @@ test_expect_success 'protocol v2 supports hiderefs' '
217
218
test_expect_success 'ls-remote --symref' '
219
git fetch origin &&
215
- cat >expect <<-EOF &&
216
- ref: refs/heads/master HEAD
217
- $(git rev-parse HEAD) HEAD
218
- $(git rev-parse refs/heads/master) refs/heads/master
219
- $(git rev-parse HEAD) refs/remotes/origin/HEAD
220
- $(git rev-parse refs/remotes/origin/master) refs/remotes/origin/master
221
- $(git rev-parse refs/tags/mark) refs/tags/mark
222
- $(git rev-parse refs/tags/mark1.1) refs/tags/mark1.1
223
- $(git rev-parse refs/tags/mark1.10) refs/tags/mark1.10
224
- $(git rev-parse refs/tags/mark1.2) refs/tags/mark1.2
225
- EOF
220
+ echo "ref: refs/heads/master HEAD" >expect &&
221
+ generate_references \
222
+ HEAD \
223
+ refs/heads/master >>expect &&
224
+ oid=$(git rev-parse HEAD) &&
225
+ echo "$oid refs/remotes/origin/HEAD" >>expect &&
226
+ generate_references \
227
+ refs/remotes/origin/master \
228
+ refs/tags/mark \
229
+ refs/tags/mark1.1 \
230
+ refs/tags/mark1.10 \
231
+ refs/tags/mark1.2 >>expect &&
232
# Protocol v2 supports sending symrefs for refs other than HEAD, so use
233
# protocol v0 here.
234
GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref >actual &&