summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2020-09-01 15:28:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-02 14:39:17 -0700
commitec06b05568bb9dbb7333a5974b4512db18395674 (patch)
tree6bd34965bade1919680c023bfa944414929b57de
parentsha1-name: replace unsigned int with option struct (diff)
downloadtgif-ec06b05568bb9dbb7333a5974b4512db18395674.tar.xz
refs: move dwim_ref() to header file
This makes it clear that dwim_ref() is just repo_dwim_ref() without the first parameter. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--refs.c5
-rw-r--r--refs.h8
2 files changed, 7 insertions, 6 deletions
diff --git a/refs.c b/refs.c
index 84c51a2ce4..e107919b94 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 f212f8945e..04a68540c3 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 argv_array *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);
/*