diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-10 09:59:46 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-10 09:59:46 +0200 |
commit | aaa3c8065d86e8f25850eb79e90da68d6adcf03f (patch) | |
tree | ac8883284fe2e056252c14f6916e5ee9312eff1a /wt-status.c | |
parent | The fourteenth batch (diff) | |
parent | hex: print objects using the hash algorithm member (diff) | |
download | git-aaa3c8065d86e8f25850eb79e90da68d6adcf03f.tar.xz git-aaa3c8065d86e8f25850eb79e90da68d6adcf03f.zip |
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 'wt-status.c')
-rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 34886655db..42b6735716 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1690,10 +1690,10 @@ void wt_status_get_state(struct repository *r, if (!sequencer_get_last_command(r, &action)) { if (action == REPLAY_PICK) { state->cherry_pick_in_progress = 1; - oidcpy(&state->cherry_pick_head_oid, &null_oid); + oidcpy(&state->cherry_pick_head_oid, null_oid()); } else { state->revert_in_progress = 1; - oidcpy(&state->revert_head_oid, &null_oid); + oidcpy(&state->revert_head_oid, null_oid()); } } if (get_detached_from) |