diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-10 10:59:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-10 10:59:46 +0300 |
commit | aaa3c8065d86e8f25850eb79e90da68d6adcf03f (patch) | |
tree | ac8883284fe2e056252c14f6916e5ee9312eff1a /sequencer.c | |
parent | 2d677e5b1537692a4f875740a6e9853c24285f02 (diff) | |
parent | 3dd71461e25b4cc7ea2a2d8deef1c0486bb32580 (diff) |
Merge branch 'bc/hash-transition-interop-part-1'
SHA-256 transition.
* bc/hash-transition-interop-part-1:
hex: print objects using the hash algorithm member
hex: default to the_hash_algo on zero algorithm value
builtin/pack-objects: avoid using struct object_id for pack hash
commit-graph: don't store file hashes as struct object_id
builtin/show-index: set the algorithm for object IDs
hash: provide per-algorithm null OIDs
hash: set, copy, and use algo field in struct object_id
builtin/pack-redundant: avoid casting buffers to struct object_id
Use the final_oid_fn to finalize hashing of object IDs
hash: add a function to finalize object IDs
http-push: set algorithm when reading object ID
Always use oidread to read into struct object_id
hash: add an algo member to struct object_id
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index a34ae235be..0bec01cf38 100644 --- a/sequencer.c +++ b/sequencer.c @@ -525,7 +525,7 @@ static int fast_forward_to(struct repository *r, if (!transaction || ref_transaction_update(transaction, "HEAD", to, unborn && !is_rebase_i(opts) ? - &null_oid : from, + null_oid() : from, 0, sb.buf, &err) || ref_transaction_commit(transaction, &err)) { ref_transaction_free(transaction); @@ -1132,7 +1132,7 @@ int update_head_with_reflog(const struct commit *old_head, transaction = ref_transaction_begin(err); if (!transaction || ref_transaction_update(transaction, "HEAD", new_head, - old_head ? &old_head->object.oid : &null_oid, + old_head ? &old_head->object.oid : null_oid(), 0, sb.buf, err) || ref_transaction_commit(transaction, err)) { ret = -1; |