[PATCH 03/10] t0002: abstract away SHA-1-specific constants
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Jun 4, 2018, 23:52 UTC
- Message-ID
- <20180604235229.279814-4-sandals@crustytoothpaste.net>
- In-Reply-To
- <20180604235229.279814-1-sandals@crustytoothpaste.net>
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- t/t0002-gitfile.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index 3691023d51..020af4c53c 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -89,14 +89,16 @@ test_expect_success 'enter_repo non-strict mode' ' cd enter_repo && test_tick && test_commit foo && + git rev-parse HEAD >head-revision && mv .git .realgit && echo "gitdir: .realgit" >.git ) && + head=$(cat enter_repo/head-revision) && git ls-remote enter_repo >actual && - cat >expected <<-\EOF && - 946e985ab20de757ca5b872b16d64e92ff3803a9 HEAD - 946e985ab20de757ca5b872b16d64e92ff3803a9 refs/heads/master - 946e985ab20de757ca5b872b16d64e92ff3803a9 refs/tags/foo + cat >expected <<-EOF && + $head HEAD + $head refs/heads/master + $head refs/tags/foo EOF test_cmp expected actual ' @@ -107,20 +109,20 @@ test_expect_success 'enter_repo linked checkout' ' git worktree add ../foo refs/tags/foo ) && git ls-remote foo >actual && - cat >expected <<-\EOF && - 946e985ab20de757ca5b872b16d64e92ff3803a9 HEAD - 946e985ab20de757ca5b872b16d64e92ff3803a9 refs/heads/master - 946e985ab20de757ca5b872b16d64e92ff3803a9 refs/tags/foo + cat >expected <<-EOF && + $head HEAD + $head refs/heads/master + $head refs/tags/foo EOF test_cmp expected actual ' test_expect_success 'enter_repo strict mode' ' git ls-remote --upload-pack="git upload-pack --strict" foo/.git >actual && - cat >expected <<-\EOF && - 946e985ab20de757ca5b872b16d64e92ff3803a9 HEAD - 946e985ab20de757ca5b872b16d64e92ff3803a9 refs/heads/master - 946e985ab20de757ca5b872b16d64e92ff3803a9 refs/tags/foo + cat >expected <<-EOF && + $head HEAD + $head refs/heads/master + $head refs/tags/foo EOF test_cmp expected actual '