t6020: fix incompatible parameter expansion
Ævar reported that the function `make_user_friendly_and_stable_output()` failed on a i386 box (gcc45) in the gcc farm boxes with error: sed: couldn't re-allocate memory It turns out that older versions of bash (4.3) or dash (0.5.7) cannot evaluate expression like `${A%${A#???????}}` used to get the leading 7 characters of variable A. Replace the incompatible parameter expansion so that t6020 works on older version of bash or dash. Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin committed
Jun 17, 2021 at 11:14 UTC
eb87c6f559f0d7550a5f078a5b78159c290b0256
1 file changed
+31
-19
t/t6020-bundle-misc.sh
+31
-19
@@ -80,30 +80,42 @@ test_commit_setvar () {
80
eval $var=$oid
81
}
82
83
+get_abbrev_oid () {
84
+ oid=$1 &&
85
+ suffix=${oid#???????} &&
86
+ oid=${oid%$suffix} &&
87
+ if test -n "$oid"
88
+ then
89
+ echo "$oid"
90
+ else
91
+ echo "undefined-oid"
92
+ fi
93
+}
94
+
95
# Format the output of git commands to make a user-friendly and stable
96
# text. We can easily prepare the expect text without having to worry
97
# about future changes of the commit ID and spaces of the output.
98
make_user_friendly_and_stable_output () {
99
sed \
88
- -e "s/${A%${A#???????}}[0-9a-f]*/<COMMIT-A>/g" \
89
- -e "s/${B%${B#???????}}[0-9a-f]*/<COMMIT-B>/g" \
90
- -e "s/${C%${C#???????}}[0-9a-f]*/<COMMIT-C>/g" \
91
- -e "s/${D%${D#???????}}[0-9a-f]*/<COMMIT-D>/g" \
92
- -e "s/${E%${E#???????}}[0-9a-f]*/<COMMIT-E>/g" \
93
- -e "s/${F%${F#???????}}[0-9a-f]*/<COMMIT-F>/g" \
94
- -e "s/${G%${G#???????}}[0-9a-f]*/<COMMIT-G>/g" \
95
- -e "s/${H%${H#???????}}[0-9a-f]*/<COMMIT-H>/g" \
96
- -e "s/${I%${I#???????}}[0-9a-f]*/<COMMIT-I>/g" \
97
- -e "s/${J%${J#???????}}[0-9a-f]*/<COMMIT-J>/g" \
98
- -e "s/${K%${K#???????}}[0-9a-f]*/<COMMIT-K>/g" \
99
- -e "s/${L%${L#???????}}[0-9a-f]*/<COMMIT-L>/g" \
100
- -e "s/${M%${M#???????}}[0-9a-f]*/<COMMIT-M>/g" \
101
- -e "s/${N%${N#???????}}[0-9a-f]*/<COMMIT-N>/g" \
102
- -e "s/${O%${O#???????}}[0-9a-f]*/<COMMIT-O>/g" \
103
- -e "s/${P%${P#???????}}[0-9a-f]*/<COMMIT-P>/g" \
104
- -e "s/${TAG1%${TAG1#???????}}[0-9a-f]*/<TAG-1>/g" \
105
- -e "s/${TAG2%${TAG2#???????}}[0-9a-f]*/<TAG-2>/g" \
106
- -e "s/${TAG3%${TAG3#???????}}[0-9a-f]*/<TAG-3>/g" \
100
+ -e "s/$(get_abbrev_oid $A)[0-9a-f]*/<COMMIT-A>/g" \
101
+ -e "s/$(get_abbrev_oid $B)[0-9a-f]*/<COMMIT-B>/g" \
102
+ -e "s/$(get_abbrev_oid $C)[0-9a-f]*/<COMMIT-C>/g" \
103
+ -e "s/$(get_abbrev_oid $D)[0-9a-f]*/<COMMIT-D>/g" \
104
+ -e "s/$(get_abbrev_oid $E)[0-9a-f]*/<COMMIT-E>/g" \
105
+ -e "s/$(get_abbrev_oid $F)[0-9a-f]*/<COMMIT-F>/g" \
106
+ -e "s/$(get_abbrev_oid $G)[0-9a-f]*/<COMMIT-G>/g" \
107
+ -e "s/$(get_abbrev_oid $H)[0-9a-f]*/<COMMIT-H>/g" \
108
+ -e "s/$(get_abbrev_oid $I)[0-9a-f]*/<COMMIT-I>/g" \
109
+ -e "s/$(get_abbrev_oid $J)[0-9a-f]*/<COMMIT-J>/g" \
110
+ -e "s/$(get_abbrev_oid $K)[0-9a-f]*/<COMMIT-K>/g" \
111
+ -e "s/$(get_abbrev_oid $L)[0-9a-f]*/<COMMIT-L>/g" \
112
+ -e "s/$(get_abbrev_oid $M)[0-9a-f]*/<COMMIT-M>/g" \
113
+ -e "s/$(get_abbrev_oid $N)[0-9a-f]*/<COMMIT-N>/g" \
114
+ -e "s/$(get_abbrev_oid $O)[0-9a-f]*/<COMMIT-O>/g" \
115
+ -e "s/$(get_abbrev_oid $P)[0-9a-f]*/<COMMIT-P>/g" \
116
+ -e "s/$(get_abbrev_oid $TAG1)[0-9a-f]*/<TAG-1>/g" \
117
+ -e "s/$(get_abbrev_oid $TAG2)[0-9a-f]*/<TAG-2>/g" \
118
+ -e "s/$(get_abbrev_oid $TAG3)[0-9a-f]*/<TAG-3>/g" \
119
-e "s/ *\$//"
120
}
121