summaryrefslogtreecommitdiff
path: root/t/t5411/common-functions.sh
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2021-06-17 03:17:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-06-17 05:12:22 (GMT)
commit3c06a583398f6630c7162b463ff1acbdf0110f83 (patch)
tree05cac34348beb463e83654d70e6934f9ffe4bcc5 /t/t5411/common-functions.sh
parent2bafb3d702d4cd77de0d3e68f13188980e0de734 (diff)
downloadgit-3c06a583398f6630c7162b463ff1acbdf0110f83.zip
git-3c06a583398f6630c7162b463ff1acbdf0110f83.tar.gz
git-3c06a583398f6630c7162b463ff1acbdf0110f83.tar.bz2
test: refactor to use "test_commit" to create commits
Refactor function "create_commits_in" to use "test_commit" to create commit. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5411/common-functions.sh')
-rw-r--r--t/t5411/common-functions.sh25
1 files changed, 6 insertions, 19 deletions
diff --git a/t/t5411/common-functions.sh b/t/t5411/common-functions.sh
index 6c347b4..b9c6ade 100644
--- a/t/t5411/common-functions.sh
+++ b/t/t5411/common-functions.sh
@@ -6,29 +6,16 @@
# NOTE: Never calling this function from a subshell since variable
# assignments will disappear when subshell exits.
create_commits_in () {
- repo="$1" &&
- if ! parent=$(git -C "$repo" rev-parse HEAD^{} --)
- then
- parent=
- fi &&
- T=$(git -C "$repo" write-tree) &&
+ repo="$1" && test -d "$repo" ||
+ error "Repository $repo does not exist."
shift &&
while test $# -gt 0
do
name=$1 &&
- test_tick &&
- if test -z "$parent"
- then
- oid=$(echo $name | git -C "$repo" commit-tree $T)
- else
- oid=$(echo $name | git -C "$repo" commit-tree -p $parent $T)
- fi &&
- eval $name=$oid &&
- parent=$oid &&
- shift ||
- return 1
- done &&
- git -C "$repo" update-ref refs/heads/main $oid
+ shift &&
+ test_commit -C "$repo" --no-tag "$name" &&
+ eval $name=$(git -C "$repo" rev-parse HEAD)
+ done
}
# Format the output of git-push, git-show-ref and other commands to make a