refs.c: add repo_dwim_ref()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 1f5864aa364e6c1c742eb86e73638f028a379f65..bd0fec5776d011c33640fc41bfa64624c95a84be 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -555,14 +555,20 @@ static char *substitute_branch_name(struct repository *r,
        return NULL;
 }
 
        return NULL;
 }
 

-int dwim_ref(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)

 {
 {

-       char *last_branch = substitute_branch_name(the_repository, &str, &len);
-       int   refs_found  = expand_ref(the_repository, str, len, oid, ref);
+       char *last_branch = substitute_branch_name(r, &str, &len);
+       int   refs_found  = expand_ref(r, str, len, oid, ref);

        free(last_branch);
        return refs_found;
 }
 
        free(last_branch);
        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)
 {
 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 b630d5bde7aac767768f7446731147c988ec9cd4..fd3dc1d0f4a5cfae869aa44af936d382582d0060 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -149,6 +149,7 @@ struct argv_array;
 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);
 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 dwim_ref(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);
 
 int dwim_ref(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);