[PATCH v3 2/3] refs: move dwim_ref() to header file
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Sep 1, 2020, 22:28 UTC
- Message-ID
- <6b3e3077e6db3aff3295c66b6a030ac1de8288cc.1598998707.git.jonathantanmy@google.com>
- In-Reply-To
- <cover.1598998706.git.jonathantanmy@google.com>
This makes it clear that dwim_ref() is just repo_dwim_ref() without the first parameter.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- refs.c | 5 ----- refs.h | 8 +++++++- 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c index cf09cd039f..0fa6067340 100644 --- a/refs.c +++ b/refs.c @@ -623,11 +623,6 @@ int repo_dwim_ref(struct repository *r, const char *str, int len, return refs_found; } -int dwim_ref(const char *str, int len, struct object_id *oid, char **ref) -{ - return repo_dwim_ref(the_repository, str, len, oid, ref); -} - int expand_ref(struct repository *repo, const char *str, int len, struct object_id *oid, char **ref) { diff --git a/refs.h b/refs.h index 29e28124cd..8cbef96a8d 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,7 +153,11 @@ 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_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) +{ + return repo_dwim_ref(the_repository, str, len, oid, ref); +} int dwim_log(const char *str, int len, struct object_id *oid, char **ref); /*
-- 2.28.0.402.g5ffc5be6b7-goog