From e8a8e7ff983c309b9e8edbb1a570bfbb36ad1e7c Mon Sep 17 00:00:00 2001
From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 9 Feb 2021 22:41:52 +0100
Subject: test libs: rename bundle helper to "lib-bundle.sh"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename the recently introduced test-bundle-functions.sh to be
consistent with other lib-*.sh files, which is the convention for
these sorts of shared test library functions.

The new test-bundle-functions.sh was introduced in 9901164d81d (test:
add helper functions for git-bundle, 2021-01-11). It was the only
test-*.sh of this nature.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/lib-bundle.sh            | 42 ++++++++++++++++++++++++++++++++++++++++++
 t/t5510-fetch.sh           |  2 +-
 t/t6020-bundle-misc.sh     |  2 +-
 t/test-bundle-functions.sh | 42 ------------------------------------------
 4 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 t/lib-bundle.sh
 delete mode 100644 t/test-bundle-functions.sh

diff --git a/t/lib-bundle.sh b/t/lib-bundle.sh
new file mode 100644
index 0000000000..cf7ed818b2
--- /dev/null
+++ b/t/lib-bundle.sh
@@ -0,0 +1,42 @@
+# Library of git-bundle related functions.
+
+# Display the pack data contained in the bundle file, bypassing the
+# header that contains the signature, prerequisites and references.
+convert_bundle_to_pack () {
+	while read x && test -n "$x"
+	do
+		:;
+	done
+	cat
+}
+
+# Check count of objects in a bundle file.
+# We can use "--thin" opiton to check thin pack, which must be fixed by
+# command `git-index-pack --fix-thin --stdin`.
+test_bundle_object_count () {
+	thin=
+	if test "$1" = "--thin"
+	then
+		thin=t
+		shift
+	fi
+	if test $# -ne 2
+	then
+		echo >&2 "args should be: <bundle> <count>"
+		return 1
+	fi
+	bundle=$1
+	pack=$bundle.pack
+	convert_bundle_to_pack <"$bundle" >"$pack" &&
+	if test -n "$thin"
+	then
+		mv "$pack" "$bundle.thin.pack" &&
+		git index-pack --stdin --fix-thin "$pack" <"$bundle.thin.pack"
+	else
+		git index-pack "$pack"
+	fi || return 1
+	count=$(git show-index <"${pack%pack}idx" | wc -l) &&
+	test $2 = $count && return 0
+	echo >&2 "error: object count for $bundle is $count, not $2"
+	return 1
+}
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 42f5503004..c1e0eb3923 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -9,7 +9,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/test-bundle-functions.sh
+. "$TEST_DIRECTORY"/lib-bundle.sh
 
 D=$(pwd)
 
diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh
index 6249420a80..da5fe1ba6d 100755
--- a/t/t6020-bundle-misc.sh
+++ b/t/t6020-bundle-misc.sh
@@ -9,7 +9,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/test-bundle-functions.sh
+. "$TEST_DIRECTORY"/lib-bundle.sh
 
 # Create a commit or tag and set the variable with the object ID.
 test_commit_setvar () {
diff --git a/t/test-bundle-functions.sh b/t/test-bundle-functions.sh
deleted file mode 100644
index cf7ed818b2..0000000000
--- a/t/test-bundle-functions.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# Library of git-bundle related functions.
-
-# Display the pack data contained in the bundle file, bypassing the
-# header that contains the signature, prerequisites and references.
-convert_bundle_to_pack () {
-	while read x && test -n "$x"
-	do
-		:;
-	done
-	cat
-}
-
-# Check count of objects in a bundle file.
-# We can use "--thin" opiton to check thin pack, which must be fixed by
-# command `git-index-pack --fix-thin --stdin`.
-test_bundle_object_count () {
-	thin=
-	if test "$1" = "--thin"
-	then
-		thin=t
-		shift
-	fi
-	if test $# -ne 2
-	then
-		echo >&2 "args should be: <bundle> <count>"
-		return 1
-	fi
-	bundle=$1
-	pack=$bundle.pack
-	convert_bundle_to_pack <"$bundle" >"$pack" &&
-	if test -n "$thin"
-	then
-		mv "$pack" "$bundle.thin.pack" &&
-		git index-pack --stdin --fix-thin "$pack" <"$bundle.thin.pack"
-	else
-		git index-pack "$pack"
-	fi || return 1
-	count=$(git show-index <"${pack%pack}idx" | wc -l) &&
-	test $2 = $count && return 0
-	echo >&2 "error: object count for $bundle is $count, not $2"
-	return 1
-}
-- 
cgit v1.3