diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2020-07-29 23:14:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 16:16:48 (GMT) |
| commit | e74b606d47ff65de497b06ac6c8ace6761cceea1 (patch) | |
| tree | 8baf06d35c6038dfd7ff717cdbc1941604170ceb /t/t5702-protocol-v2.sh | |
| parent | 439d3a17b66d7e2f15fac72960a09261b72ac0d7 (diff) | |
| download | git-e74b606d47ff65de497b06ac6c8ace6761cceea1.zip git-e74b606d47ff65de497b06ac6c8ace6761cceea1.tar.gz git-e74b606d47ff65de497b06ac6c8ace6761cceea1.tar.bz2 | |
builtin/verify-pack: implement an --object-format option
A recently added test in t5702 started using git verify-pack outside of
a repository. While this poses no problems with SHA-1, with SHA-256 we
implicitly rely on the setup of the repository to initialize our hash
algorithm settings.
Since we're not in a repository here, we need to provide git verify-pack
help to set things up properly. git index-pack already knows an
--object-format option, so let's accept one as well and pass it down to
our git index-pack invocation. Since we're now dynamically adjusting
the elements in argv, let's switch to using struct argv_array to manage
them. Finally, let's make t5702 pass the proper argument on down to its
git verify-pack caller.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5702-protocol-v2.sh')
| -rwxr-xr-x | t/t5702-protocol-v2.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index 1b54c35..7fc2217 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -829,7 +829,7 @@ test_expect_success 'part of packfile response provided as URI' ' # Ensure that my-blob and other-blob are in separate packfiles. for idx in http_child/.git/objects/pack/*.idx do - git verify-pack --verbose $idx >out && + git verify-pack --object-format=$(test_oid algo) --verbose $idx >out && { grep "^[0-9a-f]\{16,\} " out || : } >out.objectlist && |