12d6991cf4
Add new function "get_abbrev_oid" to get abbrev object ID. This function has a default value which helps to prepare a nonempty replace pattern for sed command. An empty replace pattern may cause sed fail to allocate memory. Refactor function "make_user_friendly_and_stable_output" to use "get_abbrev_oid" to get abbrev object ID. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
2.0 KiB
Bash
74 lines
2.0 KiB
Bash
# Create commits in <repo> and assign each commit's oid to shell variables
|
|
# given in the arguments (A, B, and C). E.g.:
|
|
#
|
|
# create_commits_in <repo> A B C
|
|
#
|
|
# NOTE: Never calling this function from a subshell since variable
|
|
# assignments will disappear when subshell exits.
|
|
create_commits_in () {
|
|
repo="$1" && test -d "$repo" ||
|
|
error "Repository $repo does not exist."
|
|
shift &&
|
|
while test $# -gt 0
|
|
do
|
|
name=$1 &&
|
|
shift &&
|
|
test_commit -C "$repo" --no-tag "$name" &&
|
|
eval $name=$(git -C "$repo" rev-parse HEAD)
|
|
done
|
|
}
|
|
|
|
get_abbrev_oid () {
|
|
oid=$1 &&
|
|
suffix=${oid#???????} &&
|
|
oid=${oid%$suffix} &&
|
|
if test -n "$oid"
|
|
then
|
|
echo "$oid"
|
|
else
|
|
echo "undefined-oid"
|
|
fi
|
|
}
|
|
|
|
# Format the output of git-push, git-show-ref and other commands to make a
|
|
# user-friendly and stable text. We can easily prepare the expect text
|
|
# without having to worry about changes of the commit ID (full or abbrev.)
|
|
# of the output. Single quotes are replaced with double quotes, because
|
|
# it is boring to prepare unquoted single quotes in expect text. We also
|
|
# remove some locale error messages. The emitted human-readable errors are
|
|
# redundant to the more machine-readable output the tests already assert.
|
|
make_user_friendly_and_stable_output () {
|
|
sed \
|
|
-e "s/'/\"/g" \
|
|
-e "s/$(get_abbrev_oid $A)[0-9a-f]*/<COMMIT-A>/g" \
|
|
-e "s/$(get_abbrev_oid $B)[0-9a-f]*/<COMMIT-B>/g" \
|
|
-e "s/$(get_abbrev_oid $TAG)[0-9a-f]*/<TAG-v123>/g" \
|
|
-e "s/$ZERO_OID/<ZERO-OID>/g" \
|
|
-e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#" \
|
|
-e "/^error: / d"
|
|
}
|
|
|
|
filter_out_user_friendly_and_stable_output () {
|
|
make_user_friendly_and_stable_output |
|
|
sed -n ${1+"$@"}
|
|
}
|
|
|
|
format_and_save_expect () {
|
|
sed -e 's/^> //' -e 's/Z$//' >expect
|
|
}
|
|
|
|
test_cmp_refs () {
|
|
indir=
|
|
if test "$1" = "-C"
|
|
then
|
|
shift
|
|
indir="$1"
|
|
shift
|
|
fi
|
|
indir=${indir:+"$indir"/}
|
|
cat >show-ref.expect &&
|
|
git ${indir:+ -C "$indir"} show-ref >show-ref.pristine &&
|
|
make_user_friendly_and_stable_output <show-ref.pristine >show-ref.filtered &&
|
|
test_cmp show-ref.expect show-ref.filtered
|
|
}
|