diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-11 07:24:46 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 07:24:46 +0200 |
commit | 676278f8ea1b9bdd8f235eceb739d7aec4f0ed67 (patch) | |
tree | 1fffd7eb97b1f32a45e89d49ab3f9613265016d1 /connected.c | |
parent | Merge branch 'en/clean-nested-with-ignored' (diff) | |
parent | midx: switch to using the_hash_algo (diff) | |
download | git-676278f8ea1b9bdd8f235eceb739d7aec4f0ed67.tar.xz git-676278f8ea1b9bdd8f235eceb739d7aec4f0ed67.zip |
Merge branch 'bc/object-id-part17'
Preparation for SHA-256 upgrade continues.
* bc/object-id-part17: (26 commits)
midx: switch to using the_hash_algo
builtin/show-index: replace sha1_to_hex
rerere: replace sha1_to_hex
builtin/receive-pack: replace sha1_to_hex
builtin/index-pack: replace sha1_to_hex
packfile: replace sha1_to_hex
wt-status: convert struct wt_status to object_id
cache: remove null_sha1
builtin/worktree: switch null_sha1 to null_oid
builtin/repack: write object IDs of the proper length
pack-write: use hash_to_hex when writing checksums
sequencer: convert to use the_hash_algo
bisect: switch to using the_hash_algo
sha1-lookup: switch hard-coded constants to the_hash_algo
config: use the_hash_algo in abbrev comparison
combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
bundle: switch to use the_hash_algo
connected: switch GIT_SHA1_HEXSZ to the_hash_algo
show-index: switch hard-coded constants to the_hash_algo
blame: remove needless comparison with GIT_SHA1_HEXSZ
...
Diffstat (limited to 'connected.c')
-rw-r--r-- | connected.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/connected.c b/connected.c index 971db009b3..36c4e5dedb 100644 --- a/connected.c +++ b/connected.c @@ -29,6 +29,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data, struct packed_git *new_pack = NULL; struct transport *transport; size_t base_len; + const unsigned hexsz = the_hash_algo->hexsz; if (!opt) opt = &defaults; @@ -100,7 +101,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data, sigchain_push(SIGPIPE, SIG_IGN); - commit[GIT_SHA1_HEXSZ] = '\n'; + commit[hexsz] = '\n'; do { /* * If index-pack already checked that: @@ -113,8 +114,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data, if (new_pack && find_pack_entry_one(oid.hash, new_pack)) continue; - memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ); - if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) { + memcpy(commit, oid_to_hex(&oid), hexsz); + if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) { if (errno != EPIPE && errno != EINVAL) error_errno(_("failed write to rev-list")); err = -1; |