Merge branch 'bc/sha-256-cvs-svn-updates'

[thirdparty/git.git] / t / t9104-git-svn-follow-parent.sh

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 5e0ad1917736591b50e65169216bd5fe80193989..67eed2fefcec974f7f166b3221150392323211c5 100755 (executable)
--- 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 &&