summaryrefslogtreecommitdiff
path: root/refs.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-23 14:29:19 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-23 14:29:19 +0900
commitca7b2ab07da7551a16f1eed49ade21aa5334021b (patch)
tree617e8174b9dbdb8218e6ad28156a91ff4d234e01 /refs.h
parent1eb437020a2c098a7c12da4c05082fbea10d98c9 (diff)
parentc251c83df276dc0bff4d008433268ad59b7a8df2 (diff)
downloadgit-ca7b2ab07da7551a16f1eed49ade21aa5334021b.tar.gz
Merge branch 'bc/object-id'
* bc/object-id: (53 commits) object: convert parse_object* to take struct object_id tree: convert parse_tree_indirect to struct object_id sequencer: convert do_recursive_merge to struct object_id diff-lib: convert do_diff_cache to struct object_id builtin/ls-tree: convert to struct object_id merge: convert checkout_fast_forward to struct object_id sequencer: convert fast_forward_to to struct object_id builtin/ls-files: convert overlay_tree_on_cache to object_id builtin/read-tree: convert to struct object_id sha1_name: convert internals of peel_onion to object_id upload-pack: convert remaining parse_object callers to object_id revision: convert remaining parse_object callers to object_id revision: rename add_pending_sha1 to add_pending_oid http-push: convert process_ls_object and descendants to object_id refs/files-backend: convert many internals to struct object_id refs: convert struct ref_update to use struct object_id ref-filter: convert some static functions to struct object_id Convert struct ref_array_item to struct object_id Convert the verify_pack callback to struct object_id Convert lookup_tag to struct object_id ...
Diffstat (limited to 'refs.h')
-rw-r--r--refs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/refs.h b/refs.h
index d18ef47128..685a979a0e 100644
--- a/refs.h
+++ b/refs.h
@@ -602,10 +602,10 @@ enum expire_reflog_flags {
* unlocked again.
*/
typedef void reflog_expiry_prepare_fn(const char *refname,
- const unsigned char *sha1,
+ const struct object_id *oid,
void *cb_data);
-typedef int reflog_expiry_should_prune_fn(unsigned char *osha1,
- unsigned char *nsha1,
+typedef int reflog_expiry_should_prune_fn(struct object_id *ooid,
+ struct object_id *noid,
const char *email,
timestamp_t timestamp, int tz,
const char *message, void *cb_data);