[05/14] t9104: make hash size independent

Message ID	20200619223947.947067-6-sandals@crustytoothpaste.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=lJm1=AA=vger.kernel.org=git-owner@kernel.org> From: "brian m. carlson" <sandals@crustytoothpaste.net> To: <git@vger.kernel.org> Cc: Matthew DeVore <matvore@google.com>, Eric Wong <e@80x24.org>, Matthieu Moy <git@matthieu-moy.fr> Subject: [PATCH 05/14] t9104: make hash size independent Date: Fri, 19 Jun 2020 22:39:38 +0000 Message-Id: <20200619223947.947067-6-sandals@crustytoothpaste.net> In-Reply-To: <20200619223947.947067-1-sandals@crustytoothpaste.net> References: <20200619223947.947067-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	SHA-256 CVS and SVN patches \| expand [00/14] SHA-256 CVS and SVN patches [01/14] t9109: make test hash independent [02/14] t9168: make test hash independent [03/14] t9108: make test hash independent [04/14] t9100: make test work with SHA-256 [05/14] t9104: make hash size independent [06/14] t9101: make hash independent [07/14] t/lib-git-svn: make hash size independent [08/14] perl: create and switch variables for hash constants [09/14] perl: make Git::IndexInfo work with SHA-256 [10/14] perl: make SVN code hash independent [11/14] git-svn: set the OID length based on hash algorithm [12/14] git-cvsserver: port to SHA-256 [13/14] git-cvsimport: port to SHA-256 [14/14] git-cvsexportcommit: port to SHA-256

Message ID

20200619223947.947067-6-sandals@crustytoothpaste.net (mailing list archive)

State

New, archived

Headers

From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Matthew DeVore <matvore@google.com>, Eric Wong <e@80x24.org>,
        Matthieu Moy <git@matthieu-moy.fr>
Subject: [PATCH 05/14] t9104: make hash size independent
Date: Fri, 19 Jun 2020 22:39:38 +0000
Message-Id: <20200619223947.947067-6-sandals@crustytoothpaste.net>
In-Reply-To: <20200619223947.947067-1-sandals@crustytoothpaste.net>
References: <20200619223947.947067-1-sandals@crustytoothpaste.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

SHA-256 CVS and SVN patches | expand

Commit Message

brian m. carlson June 19, 2020, 10:39 p.m. UTC

The size of a record in the database used by git svn is four bytes plus
the length of the binary hash.  Instead of hard-coding 24, compute this
value based on the size of the hash in use.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t9104-git-svn-follow-parent.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 5e0ad19177..67eed2fefc 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -161,6 +161,7 @@  test_expect_success "track initial change if it was only made to parent" '
 	'
 
 test_expect_success "follow-parent is atomic" '
+	record_size=$(($(test_oid rawsz) + 4)) &&
 	(
 		cd wc &&
 		svn_cmd up &&
@@ -186,7 +187,7 @@  test_expect_success "follow-parent is atomic" '
 	mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 &&
 	rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) &&
 	dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \
-	   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&
+	   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=$record_size count=1 &&
 	rm -rf "$GIT_DIR"/svn/refs/remotes/stunk &&
 	git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
 	git svn fetch -i flunk &&

[05/14] t9104: make hash size independent

Commit Message

Patch