X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=refs.h;h=f61f6d934e80b21432f93cd3b9f138770a9d2b86;hb=1833a925484675b328d5df04ffca62efa7a0a012;hp=de43cc768af559538b2db9f3383bbf2e08713ae0;hpb=37818d7db070f67a20df58ac7d5e04cc63ef1867;p=git.git diff --git a/refs.h b/refs.h index de43cc768..f61f6d934 100644 --- a/refs.h +++ b/refs.h @@ -3,7 +3,7 @@ struct ref_lock { char *ref_name; - char *log_file; + char *orig_ref_name; struct lock_file *lk; unsigned char old_sha1[20]; int lock_fd; @@ -42,11 +42,17 @@ extern void unlock_ref(struct ref_lock *lock); extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg); /** Reads log for the value of ref during at_time. **/ -extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1); +extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1, char **msg, unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt); /* iterate over reflog entries */ -typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, char *, void *); -void for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data); +typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *); +int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data); + +/* + * Calls the specified function for each reflog file until it returns nonzero, + * and returns the value + */ +extern int for_each_reflog(each_ref_fn, void *); /** Returns 0 if target has the right format for a ref. **/ extern int check_ref_format(const char *target); @@ -54,4 +60,7 @@ extern int check_ref_format(const char *target); /** rename ref, return 0 on success **/ extern int rename_ref(const char *oldref, const char *newref, const char *logmsg); +/** resolve ref in nested "gitlink" repository */ +extern int resolve_gitlink_ref(const char *name, const char *refname, unsigned char *result); + #endif /* REFS_H */