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>
This commit is contained in:
Jonathan Tan 2020-09-01 15:28:08 -07:00 коммит произвёл Junio C Hamano
Родитель a4f66a7876
Коммит ec06b05568
2 изменённых файлов: 7 добавлений и 6 удалений

5
refs.c
Просмотреть файл

@ -623,11 +623,6 @@ int repo_dwim_ref(struct repository *r, const char *str, int len,
return refs_found; 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, int expand_ref(struct repository *repo, const char *str, int len,
struct object_id *oid, char **ref) struct object_id *oid, char **ref)
{ {

8
refs.h
Просмотреть файл

@ -1,6 +1,8 @@
#ifndef REFS_H #ifndef REFS_H
#define REFS_H #define REFS_H
#include "cache.h"
struct object_id; struct object_id;
struct ref_store; struct ref_store;
struct repository; 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 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 repo_dwim_log(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); int dwim_log(const char *str, int len, struct object_id *oid, char **ref);
/* /*