X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=refs.h;h=66955181569b3d71363d8da752245f2a1efb7b1f;hb=bf0a430f70b53f94454692c9ae8ddadd18891aaa;hp=04bd25019f344b72a3e05470f675dab9b4ffc19d;hpb=b4100f366c1e5adf3a254cdc6f832aa1a4461053;p=thirdparty%2Fgit.git diff --git a/refs.h b/refs.h index 04bd25019f..6695518156 100644 --- a/refs.h +++ b/refs.h @@ -1,6 +1,8 @@ #ifndef REFS_H #define REFS_H +#include "cache.h" + struct object_id; struct ref_store; struct repository; @@ -151,9 +153,15 @@ struct strvec; void expand_ref_prefix(struct strvec *prefixes, const char *prefix); int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); -int repo_dwim_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); +int repo_dwim_ref(struct repository *r, const char *str, int len, + struct object_id *oid, char **ref, int nonfatal_dangling_mark); int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); -int dwim_ref(const char *str, int len, struct object_id *oid, char **ref); +static inline int dwim_ref(const char *str, int len, struct object_id *oid, + char **ref, int nonfatal_dangling_mark) +{ + return repo_dwim_ref(the_repository, str, len, oid, ref, + nonfatal_dangling_mark); +} int dwim_log(const char *str, int len, struct object_id *oid, char **ref); /*